| 1 |
commit: b1425ef200dd984ffd6387baa4eebc6bb0f6fb68 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Wed Jan 30 20:15:18 2013 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Wed Jan 30 20:15:18 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b1425ef2 |
| 7 |
|
| 8 |
overlay/creator: use package rules |
| 9 |
|
| 10 |
Currently, this is a no-op as package rule loading is not implemented (also |
| 11 |
previous commit). |
| 12 |
|
| 13 |
--- |
| 14 |
roverlay/overlay/creator.py | 15 +++++++++++---- |
| 15 |
1 files changed, 11 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/roverlay/overlay/creator.py b/roverlay/overlay/creator.py |
| 18 |
index 1e1c3cb..6674e24 100644 |
| 19 |
--- a/roverlay/overlay/creator.py |
| 20 |
+++ b/roverlay/overlay/creator.py |
| 21 |
@@ -27,12 +27,15 @@ except ImportError: |
| 22 |
|
| 23 |
|
| 24 |
from roverlay import config, errorqueue |
| 25 |
+ |
| 26 |
from roverlay.overlay import Overlay |
| 27 |
from roverlay.overlay.worker import OverlayWorker |
| 28 |
from roverlay.packageinfo import PackageInfo |
| 29 |
+from roverlay.packagerules.rules import PackageRules |
| 30 |
|
| 31 |
from roverlay.recipe import easyresolver |
| 32 |
|
| 33 |
+ |
| 34 |
class PseudoAtomicCounter ( object ): |
| 35 |
|
| 36 |
def __init__ ( self, start=0, long_int=False ): |
| 37 |
@@ -105,6 +108,8 @@ class OverlayCreator ( object ): |
| 38 |
self.depresolver = easyresolver.setup ( self._err_queue ) |
| 39 |
self.depresolver.make_selfdep_pool ( self.overlay.list_rule_kwargs ) |
| 40 |
|
| 41 |
+ self.package_rules = PackageRules.get_configured() |
| 42 |
+ |
| 43 |
self.NUMTHREADS = config.get ( 'EBUILD.jobcount', 0 ) |
| 44 |
|
| 45 |
self._pkg_queue = queue.Queue() |
| 46 |
@@ -214,10 +219,12 @@ class OverlayCreator ( object ): |
| 47 |
arguments: |
| 48 |
* package_info -- |
| 49 |
""" |
| 50 |
- if self.overlay.add ( package_info ): |
| 51 |
- self._pkg_queue.put ( package_info ) |
| 52 |
- # FIXME package_added is now the # of packages queued for creation |
| 53 |
- self.package_added.inc() |
| 54 |
+ if self.package_rules.apply_actions ( package_info ): |
| 55 |
+ if self.overlay.add ( package_info ): |
| 56 |
+ self._pkg_queue.put ( package_info ) |
| 57 |
+ # FIXME package_added is now the # of packages queued for creation |
| 58 |
+ self.package_added.inc() |
| 59 |
+ # else filtered out |
| 60 |
# --- end of add_package (...) --- |
| 61 |
|
| 62 |
def write_overlay ( self ): |
Archives