1 |
commit: 10cd6f63877dd53d3e19c371ea246de9f2fd1238 |
2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
3 |
AuthorDate: Tue Jun 26 15:40:41 2012 +0000 |
4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
5 |
CommitDate: Tue Jun 26 15:40:41 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=10cd6f63 |
7 |
|
8 |
extend PackageInfo |
9 |
|
10 |
* distdir can now be stored in _info |
11 |
|
12 |
modified: roverlay/packageinfo.py |
13 |
|
14 |
--- |
15 |
roverlay/packageinfo.py | 41 ++++++++++++++++++++--------------------- |
16 |
1 files changed, 20 insertions(+), 21 deletions(-) |
17 |
|
18 |
diff --git a/roverlay/packageinfo.py b/roverlay/packageinfo.py |
19 |
index fdce322..8f59439 100644 |
20 |
--- a/roverlay/packageinfo.py |
21 |
+++ b/roverlay/packageinfo.py |
22 |
@@ -143,12 +143,14 @@ class PackageInfo ( object ): |
23 |
elif key_low == 'package_file': |
24 |
# assuming that origin is in self._info |
25 |
return os.path.join ( |
26 |
- self._info ['origin'].distdir, |
27 |
+ self.get ( 'distdir' ), |
28 |
self._info ['package_filename'] |
29 |
) |
30 |
|
31 |
elif key_low == 'distdir': |
32 |
if 'origin' in self._info: |
33 |
+ # this doesn't work if the package is in a sub directory |
34 |
+ # of the repo's distdir |
35 |
return self._info ['origin'].distdir |
36 |
else: |
37 |
return os.path.dirname ( self._info ['package_file'] ) |
38 |
@@ -209,6 +211,7 @@ class PackageInfo ( object ): |
39 |
# --- end of __setitem__ (...) --- |
40 |
|
41 |
def update_now ( self, **info ): |
42 |
+ if len ( info ) == 0: return |
43 |
with self._update_lock: |
44 |
self.set_writeable() |
45 |
self.update ( **info ) |
46 |
@@ -223,33 +226,38 @@ class PackageInfo ( object ): |
47 |
|
48 |
raises: Exception when readonly |
49 |
""" |
50 |
- if len ( info ) == 0 : |
51 |
+ if len ( info ) == 0: |
52 |
# nothing to do |
53 |
return |
54 |
|
55 |
self._writelock_acquire() |
56 |
|
57 |
for key, value in info.items(): |
58 |
- if key == 'desc' or key == 'desc_data': |
59 |
- self ['desc_data'] = value |
60 |
- |
61 |
- elif key == 'ebuild': |
62 |
- self ['ebuild'] = value |
63 |
|
64 |
- elif key == 'filepath': |
65 |
- self._use_filepath ( value ) |
66 |
- |
67 |
- elif key == 'filename': |
68 |
+ if key == 'filename': |
69 |
self._use_filename ( value ) |
70 |
|
71 |
+ elif key in ( 'package_dir', 'dirpath', 'distdir' ): |
72 |
+ if value is not None: |
73 |
+ self ['distdir'] = value |
74 |
+ |
75 |
elif key == 'origin': |
76 |
self ['origin'] = value |
77 |
|
78 |
+ elif key == 'desc' or key == 'desc_data': |
79 |
+ self ['desc_data'] = value |
80 |
+ |
81 |
+ elif key == 'ebuild': |
82 |
+ self ['ebuild'] = value |
83 |
+ |
84 |
elif key == 'suggests': |
85 |
self ['has_suggests'] = value |
86 |
|
87 |
elif key == 'depres_results' or key == 'depres_result': |
88 |
- self._use_depres_result ( value ) |
89 |
+ self ['has_suggests'] = value [2] |
90 |
+ |
91 |
+ elif key == 'filepath': |
92 |
+ self._use_filepath ( value ) |
93 |
|
94 |
else: |
95 |
LOGGER.warning ( "unknown info key %s!" % key ) |
96 |
@@ -317,15 +325,6 @@ class PackageInfo ( object ): |
97 |
self._use_filename ( os.path.basename ( filepath ) ) |
98 |
# --- end of _use_filepath (...) --- |
99 |
|
100 |
- def _use_depres_result ( self, result ): |
101 |
- """auxiliary method for update(**kw) |
102 |
- |
103 |
- arguments: |
104 |
- * result -- |
105 |
- """ |
106 |
- self ['has_suggests'] = result [2] |
107 |
- # --- end of _use_depres_result (...) --- |
108 |
- |
109 |
def __str__ ( self ): |
110 |
return "<PackageInfo for %s>" % self.get ( |
111 |
'package_file', fallback_value='[unknown file]', do_fallback=True |