[Python-apps-commits] r10553 - in packages/slapos.core/trunk/debian (2 files)

[arnau at users.alioth.debian.org]

    Date: Friday, February 21, 2014 @ 11:58:18
  Author: arnau
Revision: 10553

bridge_name has been deprecated upstream by interface_name a long time ago.

Added:
  packages/slapos.core/trunk/debian/patches/fix_register_configuration_replace.patch
Modified:
  packages/slapos.core/trunk/debian/changelog

Modified: packages/slapos.core/trunk/debian/changelog
===================================================================
--- packages/slapos.core/trunk/debian/changelog	2014-02-21 11:56:01 UTC (rev 10552)
+++ packages/slapos.core/trunk/debian/changelog	2014-02-21 11:58:18 UTC (rev 10553)
@@ -4,6 +4,9 @@
     + debian/slapos-node-unofficial.install: Added.
     + debian/patches/system_configuration_file_by_default.patch:
       - Fix paths statically set to use system-wide ones.
+  * debian/conf/slapos-node-unofficial.cfg:
+    + bridge_name has been deprecated upstream by interface_name
+      a long time ago.
 
  -- Arnaud Fontaine <arnau at debian.org>  Fri, 21 Feb 2014 19:36:47 +0900
 

Added: packages/slapos.core/trunk/debian/patches/fix_register_configuration_replace.patch
===================================================================
--- packages/slapos.core/trunk/debian/patches/fix_register_configuration_replace.patch	                        (rev 0)
+++ packages/slapos.core/trunk/debian/patches/fix_register_configuration_replace.patch	2014-02-21 11:58:18 UTC (rev 10553)
@@ -0,0 +1,11 @@
+--- a/slapos/cli/register.py
++++ b/slapos/cli/register.py
+@@ -247,7 +247,7 @@
+         to_replace.append(('ipv6_interface', conf.ipv6_interface))
+ 
+     for key, value in to_replace:
+-        cfg = re.sub('%s\s+=.*' % key, '%s = %s' % (key, value), cfg)
++        cfg = re.sub('\n\s*%s\s*=.*' % key, '\n%s = %s' % (key, value), cfg)
+ 
+     if not dry_run:
+         with open(config_path, 'w') as fout: