[gentoo-commits] proj/R_overlay:master commit in: roverlay/, roverlay/overlay/pkgdir/, roverlay/overlay/

[André Erdmann]

commit:     0a2b1b41cfbe8ef4683ee392ed92e425343f235d
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Aug  2 10:22:30 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Aug  2 10:22:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=0a2b1b41

overlay creation, import ebuilds: fixup

* fix DOEBUILD_FETCH behavior (replaced by DOEBUILD_FETCH_WITH_MANIFEST bool)
* respect --nosync/--sync-imports
* increment 'ebuilds_imported' stats counter
* call import_ebuilds() in main(), not in Overlay.__init__()

---
 roverlay/main.py                                  |  9 +++++-
 roverlay/overlay/category.py                      | 11 ++++---
 roverlay/overlay/pkgdir/packagedir_base.py        | 39 ++++++++++++++++-------
 roverlay/overlay/pkgdir/packagedir_newmanifest.py |  4 +--
 roverlay/overlay/root.py                          |  6 ++--
 5 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/roverlay/main.py b/roverlay/main.py
index dff81a8..b67aa31 100644
--- a/roverlay/main.py
+++ b/roverlay/main.py
@@ -124,7 +124,7 @@ def main (
          # set up the repo list
          global repo_list
          repo_list = RepoList (
-            sync_enabled   = not OPTION ( 'nosync' ),
+            sync_enabled   = not conf.get_or_fail ( 'nosync' ),
             force_distroot = OPTION ( 'force_distroot' )
          )
 
@@ -291,6 +291,13 @@ def main (
             immediate_ebuild_writes = OPTION ( 'immediate_ebuild_writes' ),
          )
 
+         overlay_creator.overlay.import_ebuilds (
+            overwrite = not OPTION ( 'incremental' ),
+            nosync    = (
+               OPTION ( 'sync_imported' ) or conf.get_or_fail ( 'nosync' )
+            ),
+         )
+
          repo_list.add_packages ( overlay_creator.add_package )
          if OPTION ( 'revbump' ):
             overlay_creator.enqueue_postponed()

diff --git a/roverlay/overlay/category.py b/roverlay/overlay/category.py
index e074f98..751a26d 100644
--- a/roverlay/overlay/category.py
+++ b/roverlay/overlay/category.py
@@ -173,17 +173,18 @@ class Category ( object ):
       return os.path.isdir ( self.physical_location + os.sep + _dir )
    # --- end of has_category (...) ---
 
-   def import_ebuilds ( self, catview, *args, **kwargs ):
+   def import_ebuilds ( self, catview, **kwargs ):
       """Imports ebuilds into this category.
 
       arguments:
-      * catview         -- view object that creates EbuildView objects
-      * *args, **kwargs -- (keyword) arguments that will be passed to
-                           package dirs
+      * catview  -- view object that creates EbuildView objects
+      * **kwargs -- (keyword) arguments that will be passed to
+                     package dirs
       """
+      stats = self.STATS
       for eview in catview:
          self._get_package_dir ( eview.name ).import_ebuilds (
-            eview, *args, **kwargs
+            eview, stats=stats, **kwargs
          )
    # --- end of import_ebuilds (...) ---
 

diff --git a/roverlay/overlay/pkgdir/packagedir_base.py b/roverlay/overlay/pkgdir/packagedir_base.py
index 7d5f906..44f42e9 100644
--- a/roverlay/overlay/pkgdir/packagedir_base.py
+++ b/roverlay/overlay/pkgdir/packagedir_base.py
@@ -62,11 +62,11 @@ class PackageDirBase ( object ):
    #  other subsystems might calculate them in advance if advertised here
    HASH_TYPES = None
 
-   # DOEBUILD_FETCH
-   #  doebuild function that fetches $SRC_URI
-   #  can be overridden by subclasses if e.g. on-the-fly manifest creation
-   #  is required, too
-   DOEBUILD_FETCH = roverlay.tools.ebuild.doebuild_fetch
+   # DOEBUILD_FETCH_WITH_MANIFEST
+   #  bool that indicates whether the "ebuild <...> fetch" should create
+   #  a Manifest file (when importing ebuilds)
+   #
+   DOEBUILD_FETCH_WITH_MANIFEST = False
 
    @classmethod
    def init_base_cls ( cls ):
@@ -618,22 +618,37 @@ class PackageDirBase ( object ):
    # --- end of get_distdir (...) ---
 
    def fetch_src_for_ebuild ( self, efile ):
-      return self.DOEBUILD_FETCH (
-         ebuild_file = efile,
-         logger      = self.logger,
-         env         = self.FETCHENV.get_env ( self.get_distdir().get_root() )
-      )
+      fetch_env = self.FETCHENV.get_env ( self.get_distdir().get_root() )
+
+      if self.DOEBUILD_FETCH_WITH_MANIFEST:
+         return roverlay.tools.ebuild.doebuild_fetch_and_manifest (
+            ebuild_file = efile,
+            logger      = self.logger,
+            env         = fetch_env,
+         )
+      else:
+         return roverlay.tools.ebuilds.doebuild_fetch (
+            ebuild_file = efile,
+            logger      = self.logger,
+            env         = fetch_env,
+         )
    # --- end of fetch_src_for_ebuild (...) ---
 
-   def import_ebuilds ( self, eview, overwrite, nosync=False ):
+   def import_ebuilds ( self, eview, overwrite, nosync=False, stats=None ):
       """Imports ebuilds from an additions dir into this package dir.
 
       arguments:
       * eview      -- additions dir ebuild view
       * overwrite  -- whether to overwrite existing ebuilds or not
       * nosync     -- if True: don't fetch src files (defaults to False)
+      * stats      --
       """
 
+      stats_ebuild_imported = (
+         stats.ebuilds_imported.inc if stats is not None
+         else ( lambda: None )
+      )
+
       def import_ebuild_efile ( pvr, efile_src, fname ):
          """Imports an ebuild file into this package dir and registers it
          in self._packages.
@@ -675,6 +690,8 @@ class PackageDirBase ( object ):
             # imported ebuilds cannot be used for generating metadata.xml
             ##self._need_metadata = True
 
+            stats_ebuild_imported()
+
             return p
          except:
             # this package dir is "broken" now,

diff --git a/roverlay/overlay/pkgdir/packagedir_newmanifest.py b/roverlay/overlay/pkgdir/packagedir_newmanifest.py
index f7c258c..7bbfb86 100644
--- a/roverlay/overlay/pkgdir/packagedir_newmanifest.py
+++ b/roverlay/overlay/pkgdir/packagedir_newmanifest.py
@@ -12,8 +12,6 @@ import threading
 
 import roverlay.config
 
-import roverlay.tools.ebuild
-
 import roverlay.overlay.pkgdir.manifest.file
 import roverlay.overlay.pkgdir.packagedir_base
 
@@ -31,7 +29,7 @@ class PackageDir ( roverlay.overlay.pkgdir.packagedir_base.PackageDirBase ):
    HASH_TYPES = frozenset ( ManifestFile.HASH_TYPES )
 
    # Manifest entries for imported ebuilds have to be created during import
-   DOEBUILD_FETCH = roverlay.tools.ebuild.doebuild_fetch_and_manifest
+   DOEBUILD_FETCH_WITH_MANIFEST = True
 
    def _get_manifest ( self ):
       """Returns a ManifestFile object."""

diff --git a/roverlay/overlay/root.py b/roverlay/overlay/root.py
index 1ecf4ac..32bab35 100644
--- a/roverlay/overlay/root.py
+++ b/roverlay/overlay/root.py
@@ -91,7 +91,7 @@ class Overlay ( object ):
       rsuggests_flags,
       use_desc=None,
       runtime_incremental=False,
-      keep_n_ebuilds=None
+      keep_n_ebuilds=None,
    ):
       """Initializes an overlay.
 
@@ -179,8 +179,6 @@ class Overlay ( object ):
          # ready)
          self.scan()
 
-      self.import_ebuilds ( overwrite=( not incremental ) )
-
       if __debug__:
          # verify that these config keys exist:
          roverlay.config.get_or_fail ( "EBUILD.USE_EXPAND.name" ).rstrip()
@@ -679,7 +677,7 @@ class Overlay ( object ):
          roverlay.overlay.additionsdir.CategoryRootView ( self.additions_dir )
       ):
          self._get_category ( catview.name ).import_ebuilds (
-            catview, overwrite=overwrite
+            catview, overwrite=overwrite, nosync=nosync
          )
    # --- end of import_ebuilds (...) ---