I've merged this. The diff from the merged commit (0a71d5a870b416f2c86c8bc196004bb3fc0768a0) to your tip (0ff61d4) when rebased is just:
diff --git a/cloudinit/distros/freebsd.py b/cloudinit/distros/freebsd.py index d9f31bfd..bad112fe 100644 --- a/cloudinit/distros/freebsd.py +++ b/cloudinit/distros/freebsd.py @@ -272,7 +272,7 @@ class Distro(distros.Distro): cmd = ['ifconfig', '-l'] (nics, err) = util.subp(cmd, rcs=[0, 1]) if len(err): - LOG.warn("Error running %s: %s", cmd, err) + LOG.warning("Error running %s: %s", cmd, err) return None return nics
@@ -281,7 +281,7 @@ class Distro(distros.Distro): cmd = ['ifconfig', ifname] (if_result, err) = util.subp(cmd, rcs=[0, 1]) if len(err): - LOG.warn("Error running %s: %s", cmd, err) + LOG.warning("Error running %s: %s", cmd, err) return None return if_result
@@ -290,7 +290,7 @@ class Distro(distros.Distro): cmd = ['ifconfig', '-l', 'ether'] (nics, err) = util.subp(cmd, rcs=[0, 1]) if len(err): - LOG.warn("Error running %s: %s", cmd, err) + LOG.warning("Error running %s: %s", cmd, err) return None return nics
diff --git a/setup.py b/setup.py index 46d05219..4616599b 100755 --- a/setup.py +++ b/setup.py @@ -173,8 +173,9 @@ else: [f for f in glob('doc/examples/seed/*') if is_f(f)]), ] if os.uname()[0] != 'FreeBSD': - data_files.append([ - (ETC + '/NetworkManager/dispatcher.d/', ['tools/hook-network-manager']), + data_files.extend([ + (ETC + '/NetworkManager/dispatcher.d/', + ['tools/hook-network-manager']), (ETC + '/dhcp/dhclient-exit-hooks.d/', ['tools/hook-dhclient']), (LIB + '/udev/rules.d', [f for f in glob('udev/*.rules')]) ])
« Back to merge proposal
I've merged this. f2c86c8bc196004 bb3fc0768a0)
The diff from the merged commit (0a71d5a870b416
to your tip (0ff61d4) when rebased is just:
diff --git a/cloudinit/ distros/ freebsd. py b/cloudinit/ distros/ freebsd. py distros/ freebsd. py distros/ freebsd. py distros. Distro) :
index d9f31bfd..bad112fe 100644
--- a/cloudinit/
+++ b/cloudinit/
@@ -272,7 +272,7 @@ class Distro(
cmd = ['ifconfig', '-l']
(nics, err) = util.subp(cmd, rcs=[0, 1])
if len(err):
- LOG.warn("Error running %s: %s", cmd, err)
+ LOG.warning("Error running %s: %s", cmd, err)
return None
return nics
@@ -281,7 +281,7 @@ class Distro( distros. Distro) :
(if_result, err) = util.subp(cmd, rcs=[0, 1])
cmd = ['ifconfig', ifname]
if len(err):
- LOG.warn("Error running %s: %s", cmd, err)
+ LOG.warning("Error running %s: %s", cmd, err)
return None
return if_result
@@ -290,7 +290,7 @@ class Distro( distros. Distro) :
cmd = ['ifconfig', '-l', 'ether']
(nics, err) = util.subp(cmd, rcs=[0, 1])
if len(err):
- LOG.warn("Error running %s: %s", cmd, err)
+ LOG.warning("Error running %s: %s", cmd, err)
return None
return nics
diff --git a/setup.py b/setup.py examples/ seed/*' ) if is_f(f)]), r/dispatcher. d/', ['tools/ hook-network- manager' ]), r/dispatcher. d/', hook-network- manager' ]), dhclient- exit-hooks. d/', ['tools/ hook-dhclient' ]), *.rules' )])
index 46d05219..4616599b 100755
--- a/setup.py
+++ b/setup.py
@@ -173,8 +173,9 @@ else:
[f for f in glob('doc/
]
if os.uname()[0] != 'FreeBSD':
- data_files.append([
- (ETC + '/NetworkManage
+ data_files.extend([
+ (ETC + '/NetworkManage
+ ['tools/
(ETC + '/dhcp/
(LIB + '/udev/rules.d', [f for f in glob('udev/
])