From: "André Erdmann" <dywi@mailerd.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/db/
Date: Sat, 22 Jun 2013 15:14:26 +0000 (UTC) [thread overview]
Message-ID: <1371895631.75694bb74ee537993c03601ef96a31e9406d55d2.dywi@gentoo> (raw)
commit: 75694bb74ee537993c03601ef96a31e9406d55d2
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Jun 22 10:07:11 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> 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)
WARNING: multiple messages have this Message-ID (diff)
From: "André Erdmann" <dywi@mailerd.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/db/
Date: Sat, 22 Jun 2013 15:24:19 +0000 (UTC) [thread overview]
Message-ID: <1371895631.75694bb74ee537993c03601ef96a31e9406d55d2.dywi@gentoo> (raw)
Message-ID: <20130622152419.6kT40glNrSX6BOxO7niMLPdpxa2cX2kcBpruYOmjfUM@z> (raw)
commit: 75694bb74ee537993c03601ef96a31e9406d55d2
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sat Jun 22 10:07:11 2013 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> 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)
next reply other threads:[~2013-06-22 15:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-22 15:14 André Erdmann [this message]
2013-06-22 15:24 ` [gentoo-commits] proj/R_overlay:master commit in: roverlay/db/ André Erdmann
-- strict thread matches above, loose matches on Subject: below --
2013-07-10 15:10 [gentoo-commits] proj/R_overlay:gsoc13/next " André Erdmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371895631.75694bb74ee537993c03601ef96a31e9406d55d2.dywi@gentoo \
--to=dywi@mailerd.de \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox