| 1 |
commit: 48857ff9eae7795dc1eb2563b7f41dd89526ad03 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Tue Jul 29 18:25:57 2014 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Tue Jul 29 18:28:17 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=48857ff9 |
| 7 |
|
| 8 |
roverlay/overlay/pkgdir/packagedir_base: fix |
| 9 |
|
| 10 |
Clear "replace-only" addition control flag when revbumping. |
| 11 |
Otherwise, the revbumped package gets denied. |
| 12 |
|
| 13 |
--- |
| 14 |
roverlay/overlay/pkgdir/packagedir_base.py | 7 +++++-- |
| 15 |
1 file changed, 5 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/roverlay/overlay/pkgdir/packagedir_base.py b/roverlay/overlay/pkgdir/packagedir_base.py |
| 18 |
index 7a8a29f..ae3f10a 100644 |
| 19 |
--- a/roverlay/overlay/pkgdir/packagedir_base.py |
| 20 |
+++ b/roverlay/overlay/pkgdir/packagedir_base.py |
| 21 |
@@ -389,7 +389,7 @@ class PackageDirBase ( roverlay.overlay.base.OverlayObject ): |
| 22 |
or self.DISTMAP.check_revbump_necessary ( package_info ) |
| 23 |
): |
| 24 |
# resolve by recursion, |
| 25 |
- # keep addition_control as-is |
| 26 |
+ # clear "replace-only" addition_control |
| 27 |
assert package_info.overlay_addition_override is addition_override |
| 28 |
|
| 29 |
if (addition_override & _PKG_REVBUMP_ON_COLLISION): |
| 30 |
@@ -403,8 +403,11 @@ class PackageDirBase ( roverlay.overlay.base.OverlayObject ): |
| 31 |
# |
| 32 |
# -- end if |
| 33 |
|
| 34 |
+ package_info.revbump() |
| 35 |
+ package_info.overlay_addition_override &= ~_PKG_REPLACE_ONLY |
| 36 |
+ |
| 37 |
return package_add_main ( |
| 38 |
- package_info = package_info.revbump(), |
| 39 |
+ package_info = package_info, |
| 40 |
add_if_physical = add_if_physical, |
| 41 |
allow_postpone = allow_postpone |
| 42 |
) |
Archives