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 03BDA138200 for ; Sat, 22 Jun 2013 15:14:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 81503E0982; Sat, 22 Jun 2013 15:14:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DE3C9E0899 for ; Sat, 22 Jun 2013 15:14:28 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DEE2433E680 for ; Sat, 22 Jun 2013 15:14:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8139BE5462 for ; Sat, 22 Jun 2013 15:14:26 +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: <1371895631.75694bb74ee537993c03601ef96a31e9406d55d2.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/db/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/db/distmap.py X-VCS-Directories: roverlay/db/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 75694bb74ee537993c03601ef96a31e9406d55d2 X-VCS-Branch: gsoc13/next Date: Sat, 22 Jun 2013 15:14:26 +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: 518cfcb3-8bf3-43d5-ae3e-887d0409d91e X-Archives-Hash: 382c5bc6fe101015fb40d58f63701418 commit: 75694bb74ee537993c03601ef96a31e9406d55d2 Author: André Erdmann mailerd de> AuthorDate: Sat Jun 22 10:07:11 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Sat Jun 22 10:07:11 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=75694bb7 distmap: don't revbump if repo names don't match Given a package P that is available from two repos A and B, roverlay would add P_A ("P from A") as -r0 and P_B as -r1 (or vice versa). In subsequent runs, P_A_new's checksum would be compared to P_B and P_B_new's checksum to P_A_new, resulting in a revbump for both packages even if there are no real changes (P_A == P_A_new and/or P_B == P_B_new). Prior to supporting revbumps, roverlay would not accept P_B. This commit restores this behavior. --- roverlay/db/distmap.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roverlay/db/distmap.py b/roverlay/db/distmap.py index dfdcd01..2af3e57 100644 --- a/roverlay/db/distmap.py +++ b/roverlay/db/distmap.py @@ -165,6 +165,10 @@ class _DistMapBase ( object ): if info is None: # new file, no revbump required return False + elif info.repo_name != package_info['origin'].name: + # don't revbump if repo names don't match, this likely results in + # infinite revbumps if a package is available from more than one repo + return False elif info.compare_digest ( package_info ) [0] is True: # old digest == new digest, no revbump # (package_info should be filtered out) 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 E31FB1381F3 for ; Sat, 22 Jun 2013 15:24:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B454E0A80; Sat, 22 Jun 2013 15:24:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E36BE0A6F for ; Sat, 22 Jun 2013 15:24:22 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB25933E6EE for ; Sat, 22 Jun 2013 15:24:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6E412E5467 for ; Sat, 22 Jun 2013 15:24:19 +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: <1371895631.75694bb74ee537993c03601ef96a31e9406d55d2.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/db/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/db/distmap.py X-VCS-Directories: roverlay/db/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 75694bb74ee537993c03601ef96a31e9406d55d2 X-VCS-Branch: master Date: Sat, 22 Jun 2013 15:24:19 +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: c07a72a8-2de9-4012-95cc-d4546b33774f X-Archives-Hash: 09c401ba70a4a95dd1299f9ebe2937ee Message-ID: <20130622152419.6kT40glNrSX6BOxO7niMLPdpxa2cX2kcBpruYOmjfUM@z> commit: 75694bb74ee537993c03601ef96a31e9406d55d2 Author: André Erdmann mailerd de> AuthorDate: Sat Jun 22 10:07:11 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Sat Jun 22 10:07:11 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=75694bb7 distmap: don't revbump if repo names don't match Given a package P that is available from two repos A and B, roverlay would add P_A ("P from A") as -r0 and P_B as -r1 (or vice versa). In subsequent runs, P_A_new's checksum would be compared to P_B and P_B_new's checksum to P_A_new, resulting in a revbump for both packages even if there are no real changes (P_A == P_A_new and/or P_B == P_B_new). Prior to supporting revbumps, roverlay would not accept P_B. This commit restores this behavior. --- roverlay/db/distmap.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roverlay/db/distmap.py b/roverlay/db/distmap.py index dfdcd01..2af3e57 100644 --- a/roverlay/db/distmap.py +++ b/roverlay/db/distmap.py @@ -165,6 +165,10 @@ class _DistMapBase ( object ): if info is None: # new file, no revbump required return False + elif info.repo_name != package_info['origin'].name: + # don't revbump if repo names don't match, this likely results in + # infinite revbumps if a package is available from more than one repo + return False elif info.compare_digest ( package_info ) [0] is True: # old digest == new digest, no revbump # (package_info should be filtered out)