catch TypeError and IOError if passwdx with wrong format

diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index 7c9dbf2..7ce9891 100644 (file)
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -308,7 +308,10 @@ def do(opts, args):
                     key, val = item.split(':', 1)
                     if key == 'passwdx':
                         key = 'passwd'
-                        val = base64.b64decode(val).decode('bz2')
+                        try:
+                            val = base64.b64decode(val).decode('bz2')
+                        except (TypeError, IOError), err:
+                            raise errors.ConfigError('passwdx: %s' % err)
                     repo_auth[key] = val
                 if 'user' in repo_auth:
                     repos[url]['user'] = repo_auth['user']

diff --git a/gitbuildsys/conf.py b/gitbuildsys/conf.py
index 41b5107..f816b0f 100644 (file)
--- a/gitbuildsys/conf.py
+++ b/gitbuildsys/conf.py
@@ -413,7 +413,10 @@ distconf = $build__distconf
             opt = 'passwdx'
             val = self._get(opt, section)
             if val:
-                return base64.b64decode(val).decode('bz2')
+                try:
+                    return base64.b64decode(val).decode('bz2')
+                except (TypeError, IOError), err:
+                    raise errors.ConfigError('passwdx:%s' % err)
             else:
                 return val
         else: