[Python-apps-commits] r9688 - in packages/cloud-init/trunk/debian (3 files)

[zigo at users.alioth.debian.org]

    Date: Wednesday, May 29, 2013 @ 05:22:19
  Author: zigo
Revision: 9688

Added a patch of the test suite to use /sbin/blkid and not just blkid.

Added:
  packages/cloud-init/trunk/debian/patches/fix-path-to-blkid-binary.patch
  packages/cloud-init/trunk/debian/patches/series
Modified:
  packages/cloud-init/trunk/debian/changelog

Modified: packages/cloud-init/trunk/debian/changelog
===================================================================
--- packages/cloud-init/trunk/debian/changelog	2013-05-28 20:45:48 UTC (rev 9687)
+++ packages/cloud-init/trunk/debian/changelog	2013-05-29 05:22:19 UTC (rev 9688)
@@ -14,6 +14,8 @@
   * Made the "make test" respect DEB_BUILD_OPTIONS=nocheck.
   * Added X-Start-Before: sshd in debian/cloud-init.init, since cloud-init must
     fix the sshd host keys before it starts.
+  * Added a patch of the test suite to use /sbin/blkid and not just blkid, as
+    otherwise, the unit test fails.
 
  -- Thomas Goirand <zigo at debian.org>  Sun, 26 May 2013 16:29:45 +0000
 

Added: packages/cloud-init/trunk/debian/patches/fix-path-to-blkid-binary.patch
===================================================================
--- packages/cloud-init/trunk/debian/patches/fix-path-to-blkid-binary.patch	                        (rev 0)
+++ packages/cloud-init/trunk/debian/patches/fix-path-to-blkid-binary.patch	2013-05-29 05:22:19 UTC (rev 9688)
@@ -0,0 +1,16 @@
+Description: Fix the path to blkid in test suite
+Author: Thomas Goirand <zigo at debian.org>
+Forwarded: no
+Last-Update: 2013-05-28
+
+--- cloud-init-0.7.2.orig/cloudinit/util.py
++++ cloud-init-0.7.2/cloudinit/util.py
+@@ -998,7 +998,7 @@ def find_devs_with(criteria=None, oforma
+       LABEL=<label>
+       UUID=<uuid>
+     """
+-    blk_id_cmd = ['blkid']
++    blk_id_cmd = ['/sbin/blkid']
+     options = []
+     if criteria:
+         # Search for block devices with tokens named NAME that

Added: packages/cloud-init/trunk/debian/patches/series
===================================================================
--- packages/cloud-init/trunk/debian/patches/series	                        (rev 0)
+++ packages/cloud-init/trunk/debian/patches/series	2013-05-29 05:22:19 UTC (rev 9688)
@@ -0,0 +1 @@
+fix-path-to-blkid-binary.patch