Skip to contentSkip to conversation

Autobuilder.py: add verbose buildset parse error

RFC In review Alex Franco 2 participants 3 messages Feb 23, 2016

lore
Share & tools
lore
#0 lore raw

RFC 1/1 Autobuilder.py: add verbose buildset parse error

From: Alejandro Franco <[email protected]>

Add a more verbose Exception when a buildset parse operation fails

---
 lib/python2.7/site-packages/autobuilder/Autobuilder.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
lib/python2.7/site-packages/autobuilder/Autobuilder.py +9 -6
index 3174784..f200974 100644
@@ -118,12 +118,15 @@ class Autobuilder:
     def parseRepos(self, buildset=None):
         buildset=buildset
         if self.configdict[buildset].has_key('repos'):
-            for layer in ast.literal_eval(self.configdict[buildset]['repos']):
-                if layer.iterkeys().next() not in self.repos:
-                    schedpropstoextend, newcheckoutprops = self.CreateLayerSchedulerParams(layer=layer, trigger=buildset, triggerer=True)
-                    self.schedprops.extend(schedpropstoextend)
-                    self.checkoutprops.update(newcheckoutprops)
-                    self.repos.append(layer.iterkeys().next())
+            try:
+                for layer in ast.literal_eval(self.configdict[buildset]['repos']):
+                    if layer.iterkeys().next() not in self.repos:
+                        schedpropstoextend, newcheckoutprops = self.CreateLayerSchedulerParams(layer=layer, trigger=buildset, triggerer=True)
+                        self.schedprops.extend(schedpropstoextend)
+                        self.checkoutprops.update(newcheckoutprops)
+                        self.repos.append(layer.iterkeys().next())
+            except SyntaxError as err:
+                raise ABConfigError("%s found in %s" % (err, buildset))
         return
 
     def parseProps(self, buildset):
Signature · 1 line
1.9.1
#1 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Not sure this how this should be done, but at least it's been helpful in my case

Alex Franco

Quoted 7 lines · Alex Franco

From: Alejandro Franco <[email protected]>

Add a more verbose Exception when a buildset parse operation fails

---
 lib/python2.7/site-packages/autobuilder/Autobuilder.py | 15

+++++++++------

Review

Quoted 3 lines
 1 file changed, 9 insertions(+), 6 deletions(-)
(quoted diff) +0 -0

b/lib/python2.7/site-packages/autobuilder/Autobuilder.py

lib/python2.7/site-packages/autobuilder/Autobuilder.py class Autobuilder: · line 121

Quoted 8 lines

index 3174784..f200974 100644

lib/python2.7/site-packages/autobuilder/Autobuilder.py +0 -1
@@ -118,12 +118,15 @@ class Autobuilder:
     def parseRepos(self, buildset=None):
         buildset=buildset
         if self.configdict[buildset].has_key('repos'):
-            for layer in

ast.literal_eval(self.configdict[buildset]['repos']):

lib/python2.7/site-packages/autobuilder/Autobuilder.py class Autobuilder: · line 123

Quoted 2 lines
lib/python2.7/site-packages/autobuilder/Autobuilder.py +0 -2
-                if layer.iterkeys().next() not in self.repos:
-                    schedpropstoextend, newcheckoutprops =

self.CreateLayerSchedulerParams(layer=layer, trigger=buildset, triggerer=True)

lib/python2.7/site-packages/autobuilder/Autobuilder.py class Autobuilder:

Quoted 5 lines
lib/python2.7/site-packages/autobuilder/Autobuilder.py +2 -3
-                    self.schedprops.extend(schedpropstoextend)
-                    self.checkoutprops.update(newcheckoutprops)
-                    self.repos.append(layer.iterkeys().next())
+            try:
+                for layer in

ast.literal_eval(self.configdict[buildset]['repos']):

lib/python2.7/site-packages/autobuilder/Autobuilder.py class Autobuilder: · line 124

Quoted 2 lines
lib/python2.7/site-packages/autobuilder/Autobuilder.py +2 -0
+                    if layer.iterkeys().next() not in self.repos:
+                        schedpropstoextend, newcheckoutprops =

self.CreateLayerSchedulerParams(layer=layer, trigger=buildset, triggerer=True)

lib/python2.7/site-packages/autobuilder/Autobuilder.py class Autobuilder: · line 132

Quoted 8 lines
lib/python2.7/site-packages/autobuilder/Autobuilder.py +5 -0
+                        self.schedprops.extend(schedpropstoextend)
+                        self.checkoutprops.update(newcheckoutprops)
+                        self.repos.append(layer.iterkeys().next())
+            except SyntaxError as err:
+                raise ABConfigError("%s found in %s" % (err, buildset))
         return
 
     def parseProps(self, buildset):

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAEBAgAGBQJWzH5AAAoJEPR9uwMY2lTLg1MH/1WoSCFXJ768TR5yGvWM5vd1 2VdHTuMRD2FlvvblbFLIrOwsYd9TU5UccijLKYcu0K1k9CiQVjDRB4D7c/uzCLQv E/ndOerRo1FkZyat2vEONfVInJTzycM2auY3j41jz1Pr4uyNhnJphgVzC/Kinf/F PswyAYYnnV6ytTXFLBx4dSX5AIO0qXmoX9pmEP5W+FfmkjBQlqrbAScomyNSamhf SGpC9520wUo7tke/2qLz5PgVkZ8LGR7ZlW6qEErZY462bW/cLWWpnP77c6ll3wiX huC4iQtSTwJ0ZKl1NWHz0N9Fs8f9ky41VOxaD3EAjdroqMlKnfd8LkDfo6g2cm4= =9eQK
-----END PGP SIGNATURE-----

#2 lore raw
In reply to Alex Franco
Quoted 4 lines · Alex Franco

From: Alejandro Franco <[email protected]>

Add a more verbose Exception when a buildset parse operation fails

Approved and in master.

-b

Quoted 34 lines
---
 lib/python2.7/site-packages/autobuilder/Autobuilder.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
lib/python2.7/site-packages/autobuilder/Autobuilder.py +9 -7
index 3174784..f200974 100644
@@ -118,12 +118,15 @@ class Autobuilder:
     def parseRepos(self, buildset=None):
         buildset=buildset
         if self.configdict[buildset].has_key('repos'):
-            for layer in ast.literal_eval(self.configdict[buildset]['repos']):
-                if layer.iterkeys().next() not in self.repos:
-                    schedpropstoextend, newcheckoutprops = self.CreateLayerSchedulerParams(layer=layer, trigger=buildset, triggerer=True)
-                    self.schedprops.extend(schedpropstoextend)
-                    self.checkoutprops.update(newcheckoutprops)
-                    self.repos.append(layer.iterkeys().next())
+            try:
+                for layer in ast.literal_eval(self.configdict[buildset]['repos']):
+                    if layer.iterkeys().next() not in self.repos:
+                        schedpropstoextend, newcheckoutprops = self.CreateLayerSchedulerParams(layer=layer, trigger=buildset, triggerer=True)
+                        self.schedprops.extend(schedpropstoextend)
+                        self.checkoutprops.update(newcheckoutprops)
+                        self.repos.append(layer.iterkeys().next())
+            except SyntaxError as err:
+                raise ABConfigError("%s found in %s" % (err, buildset))
         return
 
     def parseProps(self, buildset):
--

1.9.1

Signature · 3 lines
Elizabeth Flanagan
Yocto Project
Build and Release