Gentoo Archives: gentoo-commits

From: "André Erdmann" <dywi@×××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/
Date: Tue, 31 Jul 2012 17:52:07
Message-Id: 1343743055.847956c1d54647d0cfdbd9de2adc21d8404b82ff.dywi@gentoo
1 commit: 847956c1d54647d0cfdbd9de2adc21d8404b82ff
2 Author: André Erdmann <dywi <AT> mailerd <DOT> de>
3 AuthorDate: Tue Jul 31 13:57:35 2012 +0000
4 Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
5 CommitDate: Tue Jul 31 13:57:35 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=847956c1
7
8 PackageInfo.update: reduce if-checks
9
10 use a simple_keys iterable to determine which key,value pairs can directly be
11 used (self._info [key] = value) instead of an if-check per key.
12 The logger message for unknown keys is a bit more accurate now.
13
14 ---
15 roverlay/packageinfo.py | 31 ++++++++++++++-----------------
16 1 files changed, 14 insertions(+), 17 deletions(-)
17
18 diff --git a/roverlay/packageinfo.py b/roverlay/packageinfo.py
19 index 731b62c..4514d4f 100644
20 --- a/roverlay/packageinfo.py
21 +++ b/roverlay/packageinfo.py
22 @@ -260,32 +260,29 @@ class PackageInfo ( object ):
23 # nothing to do
24 return
25
26 + simple_keys = frozenset ((
27 + 'origin',
28 + 'desc_data',
29 + 'ebuild',
30 + 'ebuild_file',
31 + 'physical_only',
32 + 'src_uri'
33 + ))
34 +
35 self._writelock_acquire()
36
37 for key, value in info.items():
38
39 - if key == 'filename':
40 + if key in simple_keys:
41 + self [key] = value
42 +
43 + elif key == 'filename':
44 self._use_filename ( value )
45
46 elif key == 'distdir':
47 if value is not None:
48 self ['distdir'] = value
49
50 - elif key == 'origin':
51 - self ['origin'] = value
52 -
53 - elif key == 'desc_data':
54 - self ['desc_data'] = value
55 -
56 - elif key == 'ebuild':
57 - self ['ebuild'] = value
58 -
59 - elif key == 'ebuild_file':
60 - self ['ebuild_file'] = value
61 -
62 - elif key == 'physical_only':
63 - self ['physical_only'] = value
64 -
65 elif key == 'pvr':
66 self._use_pvr ( value )
67
68 @@ -309,7 +306,7 @@ class PackageInfo ( object ):
69 self._remove_auto ( value )
70
71 else:
72 - LOGGER.error ( "unknown info key {}!".format ( key ) )
73 + LOGGER.error ( "in update(): unknown info key {}!".format ( key ) )
74
75 self._update_lock.release()
76 # --- end of update (**kw) ---