From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6757E13877A for ; Sat, 23 Aug 2014 19:03:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62505E0970; Sat, 23 Aug 2014 19:03:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C85A9E0970 for ; Sat, 23 Aug 2014 19:03:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B2DEC34028E for ; Sat, 23 Aug 2014 19:03:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EB1F73C36 for ; Sat, 23 Aug 2014 19:03:04 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1406658497.48857ff9eae7795dc1eb2563b7f41dd89526ad03.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/overlay/pkgdir/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/overlay/pkgdir/packagedir_base.py X-VCS-Directories: roverlay/overlay/pkgdir/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 48857ff9eae7795dc1eb2563b7f41dd89526ad03 X-VCS-Branch: master Date: Sat, 23 Aug 2014 19:03:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 246d38c2-08e6-40ab-bdb7-ba3483651cce X-Archives-Hash: 27a84ea7d0169f510b62d9a25bf9ad5d commit: 48857ff9eae7795dc1eb2563b7f41dd89526ad03 Author: André Erdmann mailerd de> AuthorDate: Tue Jul 29 18:25:57 2014 +0000 Commit: André Erdmann mailerd de> CommitDate: Tue Jul 29 18:28:17 2014 +0000 URL: http://sources.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 ) From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EA74B1391DB for ; Tue, 29 Jul 2014 18:29:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1859FE095A; Tue, 29 Jul 2014 18:29:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 753B9E0969 for ; Tue, 29 Jul 2014 18:29:24 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52E923401A0 for ; Tue, 29 Jul 2014 18:29:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 220FE18BFD for ; Tue, 29 Jul 2014 18:29:21 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1406658497.48857ff9eae7795dc1eb2563b7f41dd89526ad03.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/overlay/pkgdir/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/overlay/pkgdir/packagedir_base.py X-VCS-Directories: roverlay/overlay/pkgdir/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 48857ff9eae7795dc1eb2563b7f41dd89526ad03 X-VCS-Branch: master Date: Tue, 29 Jul 2014 18:29:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4c15f79a-7887-4ab4-abd3-5ec82fb1af44 X-Archives-Hash: 45614ff2845b5f2ed3fab3291271d453 Message-ID: <20140729182921.U7GmoX5L1M2TC4I1QeEhCS5MQ-zw3JqKX8sZ_I1qt20@z> commit: 48857ff9eae7795dc1eb2563b7f41dd89526ad03 Author: André Erdmann mailerd de> AuthorDate: Tue Jul 29 18:25:57 2014 +0000 Commit: André Erdmann mailerd 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 )