Ubuntu Pastebin

Paste from cjwatson at Wed, 6 May 2015 15:16:57 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
=== modified file 'lib/cdimage/livefs.py'
--- lib/cdimage/livefs.py	2014-11-13 07:16:42 +0000
+++ lib/cdimage/livefs.py	2015-05-06 15:16:43 +0000
@@ -197,8 +197,10 @@ def live_build_lp_kwargs(config, lp, lp_
     metadata_override = {}
 
     lp_ds = lp_livefs.distro_series
-    if config["EXTRA_PPAS"]:
-        ppa = config["EXTRA_PPAS"].split()[0]
+    metadata = lp_livefs.metadata
+    extra_ppas = config.get("EXTRA_PPAS", metadata.get("extra_ppas"))
+    if extra_ppas:
+        ppa = extra_ppas.split()[0]
         ppa_owner_name, ppa_name = ppa.split("/", 1)
         ppa = lp.people[ppa_owner_name].getPPAByName(name=ppa_name)
         kwargs["archive"] = ppa
Download as text