Merge ~smoser/cloud-init:feature/move-to-git into ~larsks/cloud-init:feature/move-to-git

[Scott Moser]

[Scott Moser (smoser)]

i pulled this into trunk.

diff --git a/packages/bddeb b/packages/bddeb
index 3c77ce1..46c07c8 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -180,13 +180,10 @@ def main():
 
     with util.tempdir() as tdir:
 
-        cmd = [util.abs_join(find_root(), 'tools', 'read-version')]
+        # output like 0.7.6-1022-g36e92d3
+        cmd = ['git', 'describe', '--long']
         (sysout, _stderr) = util.subp(cmd)
-        version = sysout.strip()
-
-        cmd = ['bzr', 'revno']
-        (sysout, _stderr) = util.subp(cmd)
-        revno = sysout.strip()
+        version, extra = sysout.strip().split("-", 1)
 
         # This is really only a temporary archive
         # since we will extract it then add in the debian
@@ -212,12 +209,12 @@ def main():
             append_requires=['cloud-utils | cloud-guest-utils']
         else:
             append_requires=[]
-        write_debian_folder(xdir, version, revno, pkgmap,
+        write_debian_folder(xdir, version, extra, pkgmap,
                             pyver=pyver, append_requires=append_requires)
 
         # The naming here seems to follow some debian standard
         # so it will whine if it is changed...
-        tar_fn = "cloud-init_%s~bzr%s.orig.tar.gz" % (version, revno)
+        tar_fn = "cloud-init_%s+%s~bddeb.orig.tar.gz" % (version, extra)
         print("Archiving the adjusted source into %r" %
               (util.abs_join(tdir, tar_fn)))
         cmd = ['tar', '-czvf',
diff --git a/packages/debian/changelog.in b/packages/debian/changelog.in
index c9affe4..544d23c 100644
--- a/packages/debian/changelog.in
+++ b/packages/debian/changelog.in
@@ -1,5 +1,5 @@
 ## template:basic
-cloud-init (${version}~bzr${revision}-1) UNRELEASED; urgency=low
+cloud-init (${version}+${revision}~bddeb-1) UNRELEASED; urgency=low
 
   * build
 
diff --git a/tests/unittests/test_handler/test_handler_mcollective.py b/tests/unittests/test_handler/test_handler_mcollective.py
index 6aefb93..8fa0147 100644
--- a/tests/unittests/test_handler/test_handler_mcollective.py
+++ b/tests/unittests/test_handler/test_handler_mcollective.py
@@ -49,7 +49,7 @@ class TestConfig(t_help.FilesystemMockingTestCase):
             self.tmp, "./" + cc_mcollective.SERVER_CFG)
         self.pubcert_file = os.path.join(
             self.tmp, "./" + cc_mcollective.PUBCERT_FILE)
-        self.pricert_file= os.path.join(
+        self.pricert_file = os.path.join(
             self.tmp, self.tmp, "./" + cc_mcollective.PRICERT_FILE)
 
     def test_basic_config(self):
@@ -86,7 +86,8 @@ class TestConfig(t_help.FilesystemMockingTestCase):
         cc_mcollective.configure(config=cfg, server_cfg=self.server_cfg)
         self.assertTrue(os.path.exists(self.server_cfg))
         self.assertTrue(os.path.exists(self.server_cfg + ".old"))
-        self.assertEqual(util.load_file(self.server_cfg + ".old"), STOCK_CONFIG)
+        self.assertEqual(util.load_file(self.server_cfg + ".old"),
+                         STOCK_CONFIG)
 
     def test_existing_updated(self):
         cfg = {'loglevel': 'warn'}
@@ -101,9 +102,9 @@ class TestConfig(t_help.FilesystemMockingTestCase):
                'public-cert': "this is my public-certificate",
                'private-cert': "secret private certificate"}
 
-        cc_mcollective.configure(config=cfg,
-            server_cfg=self.server_cfg, pricert_file=self.pricert_file,
-            pubcert_file=self.pubcert_file)
+        cc_mcollective.configure(
+            config=cfg, server_cfg=self.server_cfg,
+            pricert_file=self.pricert_file, pubcert_file=self.pubcert_file)
 
         found = configobj.ConfigObj(self.server_cfg)
 
diff --git a/tools/make-tarball b/tools/make-tarball
index 25d6f93..c99f551 100755
--- a/tools/make-tarball
+++ b/tools/make-tarball
@@ -2,6 +2,7 @@
 set -e
 
 rev=${1:-HEAD}
+<<<<<<< tools/make-tarball
 if [ "$rev" = HEAD ]; then
     revname=$(git describe --tags)
 else
@@ -10,6 +11,18 @@ fi
 
 archive_base="cloud-init-$revname"
 
+=======
+revname=$(git describe $rev)
+
+# revname could be 0.7.5 or 0.7.5-NNN-gHASH
+# turn that into 0.7.5 or 0.7.5+NNN.gHASH
+case "$revname" in
+   *-*) revname=$(echo "$revname" | sed -e 's/-/+/' -e 's/-/./')
+esac
+
+archive_base="cloud-init-$revname"
+
+>>>>>>> tools/make-tarball
 # when building an archiving from HEAD, ensure that there aren't any
 # uncomitted changes in the working directory (because these would not
 # end up in the archive).
@@ -24,8 +37,16 @@ if [ "$rev" = HEAD ] && ! git diff-index --quiet HEAD --; then
 fi
 
 git archive \
+<<<<<<< tools/make-tarball
     --format=tar \
     --prefix "$archive_base/" $rev > "$archive_base.tar"
 gzip -f9 ${archive_base}.tar
 
 echo ${archive_base}.tar.gz
+=======
+    --format=tar.gz \
+    --prefix="$archive_base/" "$rev" \
+    "--output=$archive_base.tar.gz"
+
+echo "${archive_base}.tar.gz"
+>>>>>>> tools/make-tarball