public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Devan Franchini" <twitch153@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/layman:master commit in: layman/overlays/
Date: Tue, 14 Jul 2015 15:15:00 +0000 (UTC)	[thread overview]
Message-ID: <1436886954.cf8329cb7218173bba6cc57ed8f43e54e8ec9775.twitch153@gentoo> (raw)

commit:     cf8329cb7218173bba6cc57ed8f43e54e8ec9775
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 15:15:54 2015 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 14 15:15:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/layman.git/commit/?id=cf8329cb

overlay.py: Adds better error handling for missing "source" entries

 layman/overlays/overlay.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py
index 6e289b6..c6a0cee 100755
--- a/layman/overlays/overlay.py
+++ b/layman/overlays/overlay.py
@@ -160,10 +160,13 @@ class Overlay(object):
             msg = 'Overlay from_dict(), "name" entry missing from dictionary!'
             raise Exception(msg)
 
-        _sources = overlay['source']
+        if 'source' in overlay:
+            _sources = overlay['source']
+        else:
+            _sources = None
 
         if _sources == None:
-            msg = 'Overlay from_dict(), "%(name)s" is missing a "source"'\
+            msg = 'Overlay from_dict(), "%(name)s" is missing a "source" '\
                   'entry!' % {'name': self.name}
             raise Exception(msg)
 
@@ -267,10 +270,13 @@ class Overlay(object):
             msg = 'Overlay from_json(), "name" entry missing from json!'
             raise Exception(msg)
 
-        _sources = json['source']
+        if 'source' in json:
+            _sources = json['source']
+        else:
+            _sources = None
 
         if _sources == None:
-            msg = 'Overlay from_json(), "%(name)s" is missing a "source"'\
+            msg = 'Overlay from_json(), "%(name)s" is missing a "source" '\
                   'entry!' % {'name': self.name}
             raise Exception(msg)
 


             reply	other threads:[~2015-07-14 15:15 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-14 15:15 Devan Franchini [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-08-28  3:50 [gentoo-commits] proj/layman:master commit in: layman/overlays/ Devan Franchini
2015-08-28  3:43 Devan Franchini
2015-08-28  0:41 Devan Franchini
2015-08-04  0:23 Devan Franchini
2015-07-21 16:39 Devan Franchini
2015-07-13 23:05 Devan Franchini
2015-07-13 19:04 Devan Franchini
2015-07-13 18:59 Devan Franchini
2015-07-13 18:52 Devan Franchini
2015-07-13 18:48 Devan Franchini
2015-07-10 16:13 Devan Franchini
2015-03-26 23:47 Devan Franchini
2015-03-26 23:08 Devan Franchini
2015-03-26 18:13 Devan Franchini
2014-12-08  4:15 Devan Franchini
2014-06-16  3:40 Brian Dolbec
2014-06-16  3:40 Brian Dolbec
2014-06-16  3:37 [gentoo-commits] proj/layman:gsoc2014 " Brian Dolbec
2014-06-16  3:40 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2014-06-16  3:37 [gentoo-commits] proj/layman:gsoc2014 " Brian Dolbec
2014-06-16  3:40 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2014-06-16  3:37 [gentoo-commits] proj/layman:gsoc2014 " Brian Dolbec
2014-06-16  3:40 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2014-06-16  3:37 [gentoo-commits] proj/layman:gsoc2014 " Brian Dolbec
2014-06-16  3:40 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2014-06-16  3:37 [gentoo-commits] proj/layman:gsoc2014 " Brian Dolbec
2014-06-16  3:40 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2014-06-16  3:37 [gentoo-commits] proj/layman:gsoc2014 " Brian Dolbec
2014-06-16  3:40 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2014-06-16  3:37 [gentoo-commits] proj/layman:gsoc2014 " Brian Dolbec
2014-06-16  3:40 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2014-03-10  3:18 Brian Dolbec
2013-08-18 16:46 Brian Dolbec
2012-11-01  7:06 Brian Dolbec
2012-10-08  6:16 Brian Dolbec
2012-10-08  4:36 Brian Dolbec
2012-10-07 23:40 Brian Dolbec
2012-01-06  8:16 Brian Dolbec
2011-09-26  1:18 Brian Dolbec
2011-09-24  6:07 Brian Dolbec
2011-09-13 14:16 Brian Dolbec
2011-09-05 16:09 Brian Dolbec
2011-08-07  8:47 Brian Dolbec
2011-08-07  8:39 Brian Dolbec
2011-07-28 21:33 Brian Dolbec
2011-07-23  6:45 Brian Dolbec
2011-05-05  9:44 Brian Dolbec
2011-04-30 22:37 Brian Dolbec
2011-04-30  6:37 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-02-17 21:53 Brian Dolbec
2011-02-14  6:00 Brian Dolbec
2011-02-14  6:00 Brian Dolbec

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1436886954.cf8329cb7218173bba6cc57ed8f43e54e8ec9775.twitch153@gentoo \
    --to=twitch153@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox