Changeset ferringb%2Fpkgcore-dev,3499

Timestamp:

06/28/08 12:00:15 (8 weeks ago)

Author:

Brian Harring <ferringb@…>

Message:

add configurable to control installing binpkgs from the target_repo back into the target_repo; generally undesired to have that occur, but could be useful for customizing a pkg contents set

Location:

ferringb/pkgcore-dev

Files:

• NEWS (modified) (1 diff)
• pkgcore/merge/triggers.py (modified) (1 diff)

ferringb/pkgcore-dev/NEWS

@@ -4 +4 @@
 See ChangeLog for full commit logs; this is summarized/major changes.
 
+
+* add 'skip_if_source' option to misc. binpkg merging triggers- defaults to
+  True, controls whether or not if a pkg from the target_repo should be
+  reinstalled to the repo.
 
 * make contentsSet.map_directory_structure go recursive-

ferringb/pkgcore-dev/pkgcore/merge/triggers.py

@@ -603 +603 @@
 
     pkgcore_config_type = ConfigHint({'target_repo':'ref:repo',
-        'pristine':'bool'}, typename='trigger', required=['target_repo'])
-
-    def __init__(self, target_repo, pristine=True):
+        'pristine':'bool', 'skip_if_source':'bool'}, typename='trigger',
+         required=['target_repo'])
+
+    def __init__(self, target_repo, pristine=True, skip_if_source=True):
         if not pristine:
             self._hooks = ('pre_merge',)
             self.required_csets = ('install',)
+        self.skip_if_source = skip_if_source
         self.target_repo = target_repo
 
     def trigger(self, engine, cset):
         pkg = getattr(engine, self._copy_source)
+        if self.skip_if_source and getattr(pkg, 'repo') == self.target_repo:
+            return
+
         old_pkg = self.target_repo.match(pkg.versioned_atom)
         wrapped_pkg = MutatedPkg(pkg, {'contents':cset})