Change in vdsm[ovirt-3.5]: net: _upgrade_onboot failed on python 2.6.6

ibarkan at redhat.com ibarkan at redhat.com
Mon Jul 13 12:09:04 UTC 2015


Ido Barkan has uploaded a new change for review.

Change subject: net: _upgrade_onboot failed on python 2.6.6
......................................................................

net: _upgrade_onboot failed on python 2.6.6

The flags keyword argument was added only on python 2.7.

Change-Id: I5be906c7e26abc5c870566202fefb38ffe0b8bb2
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
---
M vdsm/vdsm-restore-net-config
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/43507/1

diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config
index 6c30685..c879442 100755
--- a/vdsm/vdsm-restore-net-config
+++ b/vdsm/vdsm-restore-net-config
@@ -104,8 +104,7 @@
 def _upgrade_onboot(ifcfg_file):
     with open(ifcfg_file) as f:
         old_content = f.read()
-    new_content = re.sub('^ONBOOT=no$', 'ONBOOT=yes', old_content,
-                         flags=re.MULTILINE)
+    new_content = re.sub('ONBOOT=no', 'ONBOOT=yes', old_content)
     if new_content != old_content:
         logging.debug("updating %s to ONBOOT=yes", ifcfg_file)
         with open(ifcfg_file, 'w') as f:


-- 
To view, visit https://gerrit.ovirt.org/43507
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5be906c7e26abc5c870566202fefb38ffe0b8bb2
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>


More information about the vdsm-patches mailing list