diff options
| author |   André Erdmann <dywi@mailerd.de> | 2013-07-23 20:32:08 +0200 |
|---|---|---|
| committer | André Erdmann <dywi@mailerd.de> | 2013-07-23 20:32:08 +0200 |
| commit | 7481d8294f8ba8e6045ae84ba524b80997b72f60 (patch) | |
| tree | 8506c09de41485b8f98432caf9e119ee641c512a | |
| parent | tests/: update depres data (diff) | |
| download | R_overlay-7481d8294f8ba8e6045ae84ba524b80997b72f60.tar.gz R_overlay-7481d8294f8ba8e6045ae84ba524b80997b72f60.tar.bz2 R_overlay-7481d8294f8ba8e6045ae84ba524b80997b72f60.zip | |
do not fail if license map file is missing
| -rw-r--r-- | roverlay/rpackage/licensemap.py | 13 |
1 files 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 ) |