| 1 |
Author: grobian |
| 2 |
Date: 2009-04-03 10:18:30 +0000 (Fri, 03 Apr 2009) |
| 3 |
New Revision: 13284 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/bin/egencache |
| 7 |
main/branches/prefix/pym/portage/dbapi/vartree.py |
| 8 |
Log: |
| 9 |
Merged from trunk -r13280:13282 |
| 10 |
|
| 11 |
| 13281 | Inside tar_contents(), don't emulate tar --numeric-id | |
| 12 |
| zmedico | option. The uid/gid might be different on the system where | |
| 13 |
| | the package will be installed, so we need to store the | |
| 14 |
| | actual user/group name in the tar file. | |
| 15 |
|
| 16 |
| 13282 | Generate an error if there are no ebuilds found for a | |
| 17 |
| zmedico | package that's specified on the commandline. | |
| 18 |
|
| 19 |
|
| 20 |
Modified: main/branches/prefix/bin/egencache |
| 21 |
=================================================================== |
| 22 |
--- main/branches/prefix/bin/egencache 2009-04-03 10:16:35 UTC (rev 13283) |
| 23 |
+++ main/branches/prefix/bin/egencache 2009-04-03 10:18:30 UTC (rev 13284) |
| 24 |
@@ -116,8 +116,10 @@ |
| 25 |
if cp_iter is not None: |
| 26 |
self._cp_set = set(cp_iter) |
| 27 |
cp_iter = iter(self._cp_set) |
| 28 |
+ self._cp_missing = self._cp_set.copy() |
| 29 |
else: |
| 30 |
self._cp_set = None |
| 31 |
+ self._cp_missing = set() |
| 32 |
self._regen = _emerge.MetadataRegen(portdb, cp_iter=cp_iter, |
| 33 |
consumer=self._metadata_callback, |
| 34 |
max_jobs=max_jobs, max_load=max_load) |
| 35 |
@@ -131,6 +133,7 @@ |
| 36 |
|
| 37 |
def _metadata_callback(self, cpv, ebuild_path, repo_path, metadata): |
| 38 |
self._existing_nodes.add(cpv) |
| 39 |
+ self._cp_missing.discard(portage.cpv_getkey(cpv)) |
| 40 |
if metadata is not None: |
| 41 |
if metadata.get('EAPI') == '0': |
| 42 |
del metadata['EAPI'] |
| 43 |
@@ -174,6 +177,13 @@ |
| 44 |
self._regen.run() |
| 45 |
self.returncode |= self._regen.returncode |
| 46 |
|
| 47 |
+ if self._cp_missing: |
| 48 |
+ self.returncode |= 1 |
| 49 |
+ for cp in sorted(self._cp_missing): |
| 50 |
+ writemsg_level( |
| 51 |
+ "No ebuilds found for '%s'\n" % (cp,), |
| 52 |
+ level=logging.ERROR, noiselevel=-1) |
| 53 |
+ |
| 54 |
trg_cache = self._trg_cache |
| 55 |
dead_nodes = None |
| 56 |
if self._global_cleanse: |
| 57 |
|
| 58 |
Modified: main/branches/prefix/pym/portage/dbapi/vartree.py |
| 59 |
=================================================================== |
| 60 |
--- main/branches/prefix/pym/portage/dbapi/vartree.py 2009-04-03 10:16:35 UTC (rev 13283) |
| 61 |
+++ main/branches/prefix/pym/portage/dbapi/vartree.py 2009-04-03 10:18:30 UTC (rev 13284) |
| 62 |
@@ -4600,9 +4600,6 @@ |
| 63 |
# can properly extract it's children. |
| 64 |
live_path = os.path.realpath(live_path) |
| 65 |
tarinfo = tar.gettarinfo(live_path, arcname) |
| 66 |
- # store numbers instead of real names like tar's --numeric-owner |
| 67 |
- tarinfo.uname = id_strings.setdefault(tarinfo.uid, str(tarinfo.uid)) |
| 68 |
- tarinfo.gname = id_strings.setdefault(tarinfo.gid, str(tarinfo.gid)) |
| 69 |
|
| 70 |
if stat.S_ISREG(lst.st_mode): |
| 71 |
# break hardlinks due to bug #185305 |
Archives