[gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/db/

[gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/db/

[André Erdmann]

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)

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

[André Erdmann]

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)

[gentoo-commits] proj/R_overlay:gsoc13/next commit in: roverlay/db/

[André Erdmann]

commit:     a62e98887135863e2dce19e77eb97958f54d72a9
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 10 14:26:00 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 10 14:26:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=a62e9888

roverlay/db/distmap: add todo note

---
 roverlay/db/distmap.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roverlay/db/distmap.py b/roverlay/db/distmap.py
index 3ada05a..6d2e3b5 100644
--- a/roverlay/db/distmap.py
+++ b/roverlay/db/distmap.py
@@ -19,6 +19,8 @@ import roverlay.util
 
 __all__ = [ 'DistMapInfo', 'get_distmap' ]
 
+#COULDFIX: distmap could use roverlay.util.fileio
+
 
 class DistMapInfo ( object ):
    """Distmap entry"""