merge trunk

2 files changed, 10 insertions, 5 deletions

diff --git a/cloudinit/DataSource.py b/cloudinit/DataSource.py
index 22949b6e..06061a2e 100644
--- a/cloudinit/DataSource.py
+++ b/cloudinit/DataSource.py
@@ -130,7 +130,7 @@ class DataSource:
             # if there is an ipv4 address in 'local-hostname', then
             # make up a hostname (LP: #475354) in format ip-xx.xx.xx.xx
             lhost = self.metadata['local-hostname']
-            if util.is_ipv4(lhost):
+            if is_ipv4(lhost):
                 toks = "ip-%s" % lhost.replace(".","-")
             else:
                 toks = lhost.split(".")
diff --git a/tools/bddeb b/tools/bddeb
index 53ac9706..598f71bb 100755
--- a/tools/bddeb
+++ b/tools/bddeb
@@ -22,7 +22,12 @@ sed -i -e "s,VERSION,$version," -e "s,REVNO,bzr$revno," \
    "$TEMP_D/cloud-init/debian/changelog"
 cd "${TEMP_D}/cloud-init"
 debuild "$@"
-for x in ../*.deb; do
-   echo wrote ${x##*/}
-done
-mv ../*.deb "${start}"
+#for x in ../*.deb; do
+#   echo wrote ${x##*/}
+#done
+debname="cloud-init_${version}~bzr${revno}-0_all.deb"
+mv "../$debname" "$start"
+link="$start/cloud-init_all.deb"
+echo "wrote $debname"
+[ ! -e "$link" -o -L "$link" ] 
+   { ln -sf "$debname" "$link" && echo "linked ${link##*/}"; }