aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Erdmann <dywi@mailerd.de>2012-07-31 15:57:35 +0200
committerAndré Erdmann <dywi@mailerd.de>2012-07-31 15:57:35 +0200
commit847956c1d54647d0cfdbd9de2adc21d8404b82ff (patch)
tree9367992ae304d8514b7e21c7d0137990fc335539 /roverlay/packageinfo.py
parentdeprules: boost lib (diff)
downloadR_overlay-847956c1d54647d0cfdbd9de2adc21d8404b82ff.tar.gz
R_overlay-847956c1d54647d0cfdbd9de2adc21d8404b82ff.tar.bz2
R_overlay-847956c1d54647d0cfdbd9de2adc21d8404b82ff.zip
PackageInfo.update: reduce if-checks
use a simple_keys iterable to determine which key,value pairs can directly be used (self._info [key] = value) instead of an if-check per key. The logger message for unknown keys is a bit more accurate now.
Diffstat (limited to 'roverlay/packageinfo.py')
-rw-r--r--roverlay/packageinfo.py31
1 files changed, 14 insertions, 17 deletions
diff --git a/roverlay/packageinfo.py b/roverlay/packageinfo.py
index 731b62c..4514d4f 100644
--- a/roverlay/packageinfo.py
+++ b/roverlay/packageinfo.py
@@ -260,32 +260,29 @@ class PackageInfo ( object ):
# nothing to do
return
+ simple_keys = frozenset ((
+ 'origin',
+ 'desc_data',
+ 'ebuild',
+ 'ebuild_file',
+ 'physical_only',
+ 'src_uri'
+ ))
+
self._writelock_acquire()
for key, value in info.items():
- if key == 'filename':
+ if key in simple_keys:
+ self [key] = value
+
+ elif key == 'filename':
self._use_filename ( value )
elif key == 'distdir':
if value is not None:
self ['distdir'] = value
- elif key == 'origin':
- self ['origin'] = value
-
- elif key == 'desc_data':
- self ['desc_data'] = value
-
- elif key == 'ebuild':
- self ['ebuild'] = value
-
- elif key == 'ebuild_file':
- self ['ebuild_file'] = value
-
- elif key == 'physical_only':
- self ['physical_only'] = value
-
elif key == 'pvr':
self._use_pvr ( value )
@@ -309,7 +306,7 @@ class PackageInfo ( object ):
self._remove_auto ( value )
else:
- LOGGER.error ( "unknown info key {}!".format ( key ) )
+ LOGGER.error ( "in update(): unknown info key {}!".format ( key ) )
self._update_lock.release()
# --- end of update (**kw) ---