[gentoo-commits] proj/R_overlay:master commit in: roverlay/rpackage/

[gentoo-commits] proj/R_overlay:master commit in: roverlay/rpackage/

[André Erdmann]

commit:     e78227e1e9a506e9748c58eec48980aadf800bc0
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jul 11 16:24:46 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jul 11 16:24:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=e78227e1

roverlay/rpackage/licensemap: remove debug code

---
 roverlay/rpackage/licensemap.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/roverlay/rpackage/licensemap.py b/roverlay/rpackage/licensemap.py
index ae6cffd..2332ee6 100644
--- a/roverlay/rpackage/licensemap.py
+++ b/roverlay/rpackage/licensemap.py
@@ -20,17 +20,6 @@ RE_WORD_WIPE = re.compile (
    ')'
 )
 
-MISSING = set()
-ADD_MISS = MISSING.add
-
-def write_miss():
-   with open ( '/tmp/lmiss', 'wt' ) as FH:
-      for word in MISSING:
-         FH.write ( word )
-         FH.write ( '\n' )
-
-import atexit
-atexit.register ( write_miss )
 
 def reduce_key ( key ):
    return RE_WORD_WIPE.sub ( '', RE_WIPE.sub ( '', key ) )
@@ -86,7 +75,6 @@ class LicenseMap ( object ):
          # no license_map_file
          pass
 
-      ADD_MISS ( k )
       self.logger.warning (
          "Missing license map entry for {!r} ({!r})".format ( k, key )
       )

[gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/rpackage/

[André Erdmann]

commit:     e78227e1e9a506e9748c58eec48980aadf800bc0
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jul 11 16:24:46 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jul 11 16:24:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=e78227e1

roverlay/rpackage/licensemap: remove debug code

---
 roverlay/rpackage/licensemap.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/roverlay/rpackage/licensemap.py b/roverlay/rpackage/licensemap.py
index ae6cffd..2332ee6 100644
--- a/roverlay/rpackage/licensemap.py
+++ b/roverlay/rpackage/licensemap.py
@@ -20,17 +20,6 @@ RE_WORD_WIPE = re.compile (
    ')'
 )
 
-MISSING = set()
-ADD_MISS = MISSING.add
-
-def write_miss():
-   with open ( '/tmp/lmiss', 'wt' ) as FH:
-      for word in MISSING:
-         FH.write ( word )
-         FH.write ( '\n' )
-
-import atexit
-atexit.register ( write_miss )
 
 def reduce_key ( key ):
    return RE_WORD_WIPE.sub ( '', RE_WIPE.sub ( '', key ) )
@@ -86,7 +75,6 @@ class LicenseMap ( object ):
          # no license_map_file
          pass
 
-      ADD_MISS ( k )
       self.logger.warning (
          "Missing license map entry for {!r} ({!r})".format ( k, key )
       )

[gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/rpackage/

[André Erdmann]

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 )