[node-patches] Change in ovirt-node[master]: edit-node: fix edited iso name release string

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: edit-node: fix edited iso name release string
......................................................................

edit-node: fix edited iso name release string

rhbz#823745

Signed-off-by: Joey Boggs <jboggs at redhat.com>
Change-Id: Id71c9e58041509789266436c54c3c67e11b01773
---
M tools/edit-node
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/06/10306/1

diff --git a/tools/edit-node b/tools/edit-node
index b7a5b87..3550210 100755
--- a/tools/edit-node
+++ b/tools/edit-node
@@ -716,6 +716,8 @@
             pkg = "uid-mod"
         elif options.gidmod:
             pkg = "gid-mod"
+        elif options.password:
+            pkg = "password-set"
         print "Creating Manifests"
         # Create post-image processing manifests
         cmd = "LC_ALL=C rpm -qa --qf '%%{name}-%%{version}-%%{release}.%%{arch} (%%{SIGPGP:pgpsig})\n' | sort -u > /manifest-%s-%s-rpm.txt" % (timestamp, pkg)
@@ -1504,8 +1506,11 @@
                     n = options.install
                 else:
                     n = ""
-                finished_iso = "%s.%s.iso" % \
-                    (edited_iso.strip("edited.iso"), n.replace(" ","-"))
+                if len(n) > 0:
+                    n = n + "."
+                rel_tag=LiveOS.strip(".iso").split(".")[-1]
+                finished_iso = "%s.%s%s.iso" % \
+                    (edited_iso.strip("%s.edited.iso" %rel_tag), n.replace(" ","-"), rel_tag)
                 shutil.move(edited_iso, finished_iso)
 
                 logging.info("%s.iso saved to %s"  % (editor.name, finished_iso))


--
To view, visit http://gerrit.ovirt.org/10306
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id71c9e58041509789266436c54c3c67e11b01773
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Joey Boggs <jboggs at redhat.com>