← Back to branch summary

~darkmuggle-deactivatedaccount/ubuntu/precise/cloud-init/lp1247262

« back to all changes in this revision

Viewing changes to debian/patches/lp-1247262-fix_futils_smartos.patch

  • Committer: Ben Howard
  • Date: 2013-11-01 20:44:50 UTC
  • Revision ID: ben.howard@canonical.com-20131101204450-37i1huxopsx32sfv
debian/patches/lp-1247262-fix_futils_smartos.patch:
fixed usage of util.is_true to be futil.is_true for SmartOS
datasource.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/lp-1247262-fix_futils_smartos.patch
 
1
Author: Ben Howard <ben.howard@ubuntu.com>
 
2
Bug: https://launchpad.net/bugs/1247262
 
3
Applied-Upstream: yes
 
4
Description: SmartOS datasource should use futil.is_true
 
5
Index: cloud-init-0.6.3/cloudinit/DataSourceSmartOS.py
 
6
===================================================================
 
7
--- cloud-init-0.6.3.orig/cloudinit/DataSourceSmartOS.py        2013-11-01 13:45:41.641485219 -0600
 
8
+++ cloud-init-0.6.3/cloudinit/DataSourceSmartOS.py     2013-11-01 13:46:01.165485485 -0600
 
9
@@ -137,7 +137,7 @@
 
10
 
 
11
         b64_all = self.query('base64_all', strip=True, b64=False)
 
12
         if b64_all is not None:
 
13
-            self.b64_all = util.is_true(b64_all)
 
14
+            self.b64_all = futil.is_true(b64_all)
 
15
 
 
16
         for ci_noun, attribute in SMARTOS_ATTRIB_MAP.iteritems():
 
17
             smartos_noun, strip = attribute
 
18
@@ -237,7 +237,7 @@
 
19
         b64 = query_data('b64-%s' % noun, seed_device=seed_device,
 
20
                             seed_timeout=seed_timeout, b64=False,
 
21
                             default=False, strip=True)
 
22
-        b64 = util.is_true(b64)
 
23
+        b64 = futil.is_true(b64)
 
24
 
 
25
     resp = None
 
26
     if b64 or strip: