| 1 |
commit: 2d4af7c3ebe183400bcb0b732518e03d189cf35b |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Mon Jul 30 15:50:05 2012 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Mon Jul 30 15:53:31 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=2d4af7c3 |
| 7 |
|
| 8 |
overlay: skip_manifest |
| 9 |
|
| 10 |
--- |
| 11 |
roverlay/overlay/category.py | 7 ++++++- |
| 12 |
roverlay/overlay/creator.py | 5 +++-- |
| 13 |
roverlay/overlay/root.py | 10 +++++++++- |
| 14 |
3 files changed, 18 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/roverlay/overlay/category.py b/roverlay/overlay/category.py |
| 17 |
index 2d66246..6623446 100644 |
| 18 |
--- a/roverlay/overlay/category.py |
| 19 |
+++ b/roverlay/overlay/category.py |
| 20 |
@@ -133,7 +133,12 @@ class Category ( object ): |
| 21 |
package.show ( **show_kw ) |
| 22 |
# --- end of show (...) --- |
| 23 |
|
| 24 |
- def write ( self, overwrite_ebuilds, keep_n_ebuilds, cautious ): |
| 25 |
+ def write ( self, |
| 26 |
+ overwrite_ebuilds, |
| 27 |
+ keep_n_ebuilds, |
| 28 |
+ cautious, |
| 29 |
+ skip_manifest=False |
| 30 |
+ ): |
| 31 |
"""Writes this category to its filesystem location. |
| 32 |
|
| 33 |
returns: None (implicit) |
| 34 |
|
| 35 |
diff --git a/roverlay/overlay/creator.py b/roverlay/overlay/creator.py |
| 36 |
index 5b0a973..5f346fe 100644 |
| 37 |
--- a/roverlay/overlay/creator.py |
| 38 |
+++ b/roverlay/overlay/creator.py |
| 39 |
@@ -72,7 +72,7 @@ class OverlayCreator ( object ): |
| 40 |
|
| 41 |
LOGGER = logging.getLogger ( 'OverlayCreator' ) |
| 42 |
|
| 43 |
- def __init__ ( self, logger=None, allow_write=True ): |
| 44 |
+ def __init__ ( self, skip_manifest, logger=None, allow_write=True ): |
| 45 |
|
| 46 |
if logger is None: |
| 47 |
self.logger = self.__class__.LOGGER |
| 48 |
@@ -91,7 +91,8 @@ class OverlayCreator ( object ): |
| 49 |
eclass_files = config.get ( 'OVERLAY.eclass_files', None ), |
| 50 |
ebuild_header = config.get ( 'EBUILD.default_header', None ), |
| 51 |
incremental = USE_INCREMENTAL_WRITE, |
| 52 |
- write_allowed = allow_write |
| 53 |
+ write_allowed = allow_write, |
| 54 |
+ skip_manifest = skip_manifest |
| 55 |
) |
| 56 |
|
| 57 |
self.depresolver = easyresolver.setup ( self._err_queue ) |
| 58 |
|
| 59 |
diff --git a/roverlay/overlay/root.py b/roverlay/overlay/root.py |
| 60 |
index ae3267f..53babdf 100644 |
| 61 |
--- a/roverlay/overlay/root.py |
| 62 |
+++ b/roverlay/overlay/root.py |
| 63 |
@@ -30,6 +30,7 @@ class Overlay ( object ): |
| 64 |
ebuild_header, |
| 65 |
write_allowed, |
| 66 |
incremental, |
| 67 |
+ skip_manifest, |
| 68 |
runtime_incremental=True |
| 69 |
): |
| 70 |
"""Initializes an overlay. |
| 71 |
@@ -47,8 +48,12 @@ class Overlay ( object ): |
| 72 |
* incremental -- enable/disable incremental writing: |
| 73 |
use already existing ebuilds (don't recreate |
| 74 |
them) |
| 75 |
+ * skip_manifest -- skip Manifest generation to save time |
| 76 |
+ !!! The created overlay cannot be used with |
| 77 |
+ emerge/portage |
| 78 |
* runtime_incremental -- see package.py:PackageDir.__init__ (...), |
| 79 |
Defaults to ?FIXME? |
| 80 |
+ |
| 81 |
""" |
| 82 |
self.name = name |
| 83 |
self.logger = logger.getChild ( 'overlay' ) |
| 84 |
@@ -66,6 +71,8 @@ class Overlay ( object ): |
| 85 |
self._categories = dict() |
| 86 |
self._header = EbuildHeader ( ebuild_header ) |
| 87 |
|
| 88 |
+ self.skip_manifest = skip_manifest |
| 89 |
+ |
| 90 |
# fixme or ignore: calculating eclass names twice, |
| 91 |
# once here and another time when calling _init_overlay |
| 92 |
self._header.set_eclasses ( frozenset ( |
| 93 |
@@ -325,7 +332,8 @@ class Overlay ( object ): |
| 94 |
cat.write ( |
| 95 |
overwrite_ebuilds=False, |
| 96 |
keep_n_ebuilds=config.get ( 'OVERLAY.keep_nth_latest', None ), |
| 97 |
- cautious=True |
| 98 |
+ cautious=True, |
| 99 |
+ skip_manifest=self.skip_manifest |
| 100 |
) |
| 101 |
else: |
| 102 |
# FIXME debug print |
Archives