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

[André Erdmann]

commit:     48857ff9eae7795dc1eb2563b7f41dd89526ad03
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 29 18:25:57 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 29 18:28:17 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=48857ff9

roverlay/overlay/pkgdir/packagedir_base: fix

Clear "replace-only" addition control flag when revbumping.
Otherwise, the revbumped package gets denied.

---
 roverlay/overlay/pkgdir/packagedir_base.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/roverlay/overlay/pkgdir/packagedir_base.py 
b/roverlay/overlay/pkgdir/packagedir_base.py
index 7a8a29f..ae3f10a 100644
--- a/roverlay/overlay/pkgdir/packagedir_base.py
+++ b/roverlay/overlay/pkgdir/packagedir_base.py
@@ -389,7 +389,7 @@ class PackageDirBase ( roverlay.overlay.base.OverlayObject 
):
             or self.DISTMAP.check_revbump_necessary ( package_info )
          ):
             # resolve by recursion,
-            #  keep addition_control as-is
+            #  clear "replace-only" addition_control
             assert package_info.overlay_addition_override is addition_override
 
             if (addition_override & _PKG_REVBUMP_ON_COLLISION):
@@ -403,8 +403,11 @@ class PackageDirBase ( roverlay.overlay.base.OverlayObject 
):
                #
             # -- end if
 
+            package_info.revbump()
+            package_info.overlay_addition_override &= ~_PKG_REPLACE_ONLY
+
             return package_add_main (
-               package_info    = package_info.revbump(),
+               package_info    = package_info,
                add_if_physical = add_if_physical,
                allow_postpone  = allow_postpone
             )