Ubuntu Pastebin

Paste from smoser at Wed, 14 Jun 2017 19:40:09 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
diff --git a/cloudinit/templater.py b/cloudinit/templater.py
index b3ea64e4..d409d82d 100644
--- a/cloudinit/templater.py
+++ b/cloudinit/templater.py
@@ -123,6 +123,7 @@ def render_from_file(fn, params):
         params = {}
     template_type, renderer, content = detect_template(util.load_file(fn))
     LOG.debug("Rendering content of '%s' using renderer %s", fn, template_type)
+    print("got %s" % template_type)
     return renderer(content, params)
 
 
diff --git a/packages/bddeb b/packages/bddeb
index e45af6ee..77d7faeb 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -76,7 +76,12 @@ def write_debian_folder(root, templ_data, is_python2, cloud_util_deps):
     templater.render_to_file(util.abs_join(find_root(),
                                            'packages', 'debian', 'control.in'),
                              util.abs_join(deb_dir, 'control'),
-                             params={'build_depends': ','.join(requires),
+                             params={'build_depends': requires,
+                                     'python': python})
+    templater.render_to_file(util.abs_join(find_root(),
+                                           'packages', 'debian', 'control.in'),
+                             util.abs_join("/tmp", 'control'),
+                             params={'build_depends': requires,
                                      'python': python})
 
     templater.render_to_file(util.abs_join(find_root(),
diff --git a/packages/debian/control.in b/packages/debian/control.in
index 265b261f..ccbafee7 100644
--- a/packages/debian/control.in
+++ b/packages/debian/control.in
@@ -1,9 +1,11 @@
-## template:basic
+## template: jinja
 Source: cloud-init
 Section: admin
 Priority: optional
 Maintainer: Scott Moser <smoser@ubuntu.com>
-Build-Depends: ${build_depends}
+Build-Depends: {% for r in build_depends %}
+              {{r}},
+{% endfor %}
 XS-Python-Version: all
 Standards-Version: 3.9.6
 
Download as text