public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "André Erdmann" <dywi@mailerd.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/rpackage/
Date: Tue, 23 Jul 2013 18:34:33 +0000 (UTC)	[thread overview]
Message-ID: <1374604328.7481d8294f8ba8e6045ae84ba524b80997b72f60.dywi@gentoo> (raw)

commit:     7481d8294f8ba8e6045ae84ba524b80997b72f60
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 23 18:32:08 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 23 18:32:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=7481d829

do not fail if license map file is missing

---
 roverlay/rpackage/licensemap.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/roverlay/rpackage/licensemap.py b/roverlay/rpackage/licensemap.py
index 2332ee6..f64664d 100644
--- a/roverlay/rpackage/licensemap.py
+++ b/roverlay/rpackage/licensemap.py
@@ -67,13 +67,12 @@ class LicenseMap ( object ):
       except KeyError:
          pass
 
-      try:
-         return self.license_map_file [k]
-      except KeyError:
-         pass
-      except AttributeError:
-         # no license_map_file
-         pass
+      if self.license_map_file:
+         # else no license_map_file
+         try:
+            return self.license_map_file [k]
+         except KeyError:
+            pass
 
       self.logger.warning (
          "Missing license map entry for {!r} ({!r})".format ( k, key )


WARNING: multiple messages have this Message-ID (diff)
From: "André Erdmann" <dywi@mailerd.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/rpackage/
Date: Tue, 23 Jul 2013 18:34:34 +0000 (UTC)	[thread overview]
Message-ID: <1374604328.7481d8294f8ba8e6045ae84ba524b80997b72f60.dywi@gentoo> (raw)
Message-ID: <20130723183434.uA9ui3tA_4VNSPTVPYlFVecd5YjS0fCtvlnv6j3SM8I@z> (raw)

commit:     7481d8294f8ba8e6045ae84ba524b80997b72f60
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 23 18:32:08 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 23 18:32:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=7481d829

do not fail if license map file is missing

---
 roverlay/rpackage/licensemap.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/roverlay/rpackage/licensemap.py b/roverlay/rpackage/licensemap.py
index 2332ee6..f64664d 100644
--- a/roverlay/rpackage/licensemap.py
+++ b/roverlay/rpackage/licensemap.py
@@ -67,13 +67,12 @@ class LicenseMap ( object ):
       except KeyError:
          pass
 
-      try:
-         return self.license_map_file [k]
-      except KeyError:
-         pass
-      except AttributeError:
-         # no license_map_file
-         pass
+      if self.license_map_file:
+         # else no license_map_file
+         try:
+            return self.license_map_file [k]
+         except KeyError:
+            pass
 
       self.logger.warning (
          "Missing license map entry for {!r} ({!r})".format ( k, key )


             reply	other threads:[~2013-07-23 18:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-23 18:34 André Erdmann [this message]
2013-07-23 18:34 ` [gentoo-commits] proj/R_overlay:master commit in: roverlay/rpackage/ André Erdmann
  -- strict thread matches above, loose matches on Subject: below --
2013-07-11 16:29 André Erdmann
2013-07-11 16:44 ` [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann

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=1374604328.7481d8294f8ba8e6045ae84ba524b80997b72f60.dywi@gentoo \
    --to=dywi@mailerd.de \
    --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