Merge pull request #1027 from mcodd/setup_bug_python24

setup not python24 compatible in 0.7
2012-09-08 05:24:09 -07:00 · 2012-09-08 05:24:09 -07:00 · 5b57011152
parent 335f136e71 c0638842d8
commit 5b57011152
1 changed files with 2 additions and 2 deletions
--- a/library/setup
+++ b/library/setup
@ -537,9 +537,9 @@ class LinuxNetwork(Network):
                    # interface name for each address
                    if iface in interfaces:
                        i = 0
-                        while '{0}_{1}'.format(iface, i) in interfaces:
+                        while str(iface) + "_" + str(i) in interfaces:
                            i += 1
-                        iface = '{0}_{1}'.format(iface, i)
+                        iface = str(iface) + "_" + str(i)

                    interfaces[iface] = {}
                    interfaces[iface]['macaddress'] = macaddress