| 1 |
commit: 9c53db664b4ff66472394582f6549a0509eb4df2 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Fri Jul 20 16:36:33 2012 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Fri Jul 20 16:36:33 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=9c53db66 |
| 7 |
|
| 8 |
fix manifest creation |
| 9 |
|
| 10 |
--- |
| 11 |
roverlay/overlay/manifest/helpers.py | 5 ----- |
| 12 |
roverlay/overlay/package.py | 4 ++-- |
| 13 |
roverlay/overlay/root.py | 5 +---- |
| 14 |
3 files changed, 3 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/roverlay/overlay/manifest/helpers.py b/roverlay/overlay/manifest/helpers.py |
| 17 |
index 168a119..d49ecf7 100644 |
| 18 |
--- a/roverlay/overlay/manifest/helpers.py |
| 19 |
+++ b/roverlay/overlay/manifest/helpers.py |
| 20 |
@@ -46,11 +46,6 @@ class ExternalManifestCreation ( object ): |
| 21 |
|
| 22 |
raises: *passes Exceptions from failed config lookups |
| 23 |
""" |
| 24 |
- self.logger.critical ( |
| 25 |
- "Manifest creation is broken! PORTAGE_RO_DISTDIRS does not work." |
| 26 |
- ) |
| 27 |
- return False |
| 28 |
- |
| 29 |
distdirs = ' '.join ( set ( |
| 30 |
p ['distdir'] for p in package_info_list |
| 31 |
) ) |
| 32 |
|
| 33 |
diff --git a/roverlay/overlay/package.py b/roverlay/overlay/package.py |
| 34 |
index 5b73788..2ea4cb2 100644 |
| 35 |
--- a/roverlay/overlay/package.py |
| 36 |
+++ b/roverlay/overlay/package.py |
| 37 |
@@ -67,8 +67,8 @@ class PackageDir ( object ): |
| 38 |
if shortver in self._packages: |
| 39 |
# package exists, check if it existed before script invocation |
| 40 |
if self._packages [shortver] ['physical_only']: |
| 41 |
- if not skip_if_physical: |
| 42 |
- # ignore ebuilds that exist as file |
| 43 |
+ if add_if_physical: |
| 44 |
+ # else ignore ebuilds that exist as file |
| 45 |
self._packages [shortver] = package_info |
| 46 |
added = True |
| 47 |
|
| 48 |
|
| 49 |
diff --git a/roverlay/overlay/root.py b/roverlay/overlay/root.py |
| 50 |
index 4766b02..51239e2 100644 |
| 51 |
--- a/roverlay/overlay/root.py |
| 52 |
+++ b/roverlay/overlay/root.py |
| 53 |
@@ -58,9 +58,6 @@ class Overlay ( object ): |
| 54 |
self.scan() |
| 55 |
self._init_overlay ( reimport_eclass=True, make_profiles_dir=True ) |
| 56 |
|
| 57 |
- for c in self.list_packages ( for_deprules=True ): |
| 58 |
- print ( str ( c ) ) |
| 59 |
- |
| 60 |
# --- end of __init__ (...) --- |
| 61 |
|
| 62 |
def scan ( self, **kw ): |
| 63 |
@@ -204,9 +201,9 @@ class Overlay ( object ): |
| 64 |
|
| 65 |
def finalize_write_incremental ( self ): |
| 66 |
"""Writes metadata + Manifest for all packages.""" |
| 67 |
+ self._write_categories ( only_active=True ) |
| 68 |
for cat in self._categories.values(): |
| 69 |
cat.finalize_write_incremental() |
| 70 |
- self._write_categories ( only_active=True ) |
| 71 |
# --- end of finalize_incremental (...) --- |
| 72 |
|
| 73 |
def generate_metadata ( self, **metadata_kw ): |
Archives