poldek: poldek/tests/sh/07-depsolver, poldek/install3/obsoletes.c - https:/...

[mis]

Author: mis                          Date: Wed Oct 28 20:53:11 2009 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- https://bugs.launchpad.net/poldek/+bug/299685

---- Files affected:
poldek/poldek/tests/sh:
   07-depsolver (1.10 -> 1.11) 
poldek/poldek/install3:
   obsoletes.c (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: poldek/poldek/tests/sh/07-depsolver
diff -u poldek/poldek/tests/sh/07-depsolver:1.10 poldek/poldek/tests/sh/07-depsolver:1.11
--- poldek/poldek/tests/sh/07-depsolver:1.10	Sun May 25 00:50:07 2008
+++ poldek/poldek/tests/sh/07-depsolver	Wed Oct 28 21:53:06 2009
@@ -484,8 +484,9 @@
 }
 
 
-# NFY
-_MultilibArchToNoarchUpgrade() {
+# https://bugs.launchpad.net/poldek/+bug/299685
+# poldek should allow any color -> no-color and no-color -> color upgrades 
+testMultilibNoColorDiffrentArchUpgrade() {
     ORIG_POLDEK_INSTALL="$POLDEK_INSTALL"
     POLDEK_INSTALL="$POLDEK_INSTALL -Omultilib=1"
 
@@ -493,6 +494,18 @@
     build_installed a 1-1 -a x86_64 -f "/hello.x86_64"
     build a 2-2 -a noarch -f "/hello.sh"
     try_install a-2-2.noarch "a-2-2.noarch" "a-1-1.x86_64"
+    POLDEK_INSTALL="$ORIG_POLDEK_INSTALL"
+}
+
+# same https://bugs.launchpad.net/poldek/+bug/299685
+testMultilibNoColorToColorUpgrade() {
+    ORIG_POLDEK_INSTALL="$POLDEK_INSTALL"
+    POLDEK_INSTALL="$POLDEK_INSTALL -Omultilib=1"
+
+    msgn "Preparing repositories..."
+    build_installed a 1-1 -a x86_64 -f "/hello.sh"
+    build a 2-2 -a amd64 -f "/hello.x86_64"
+    try_install a-2-2.amd64 "a-2-2.amd64" "a-1-1.x86_64"
     POLDEK_INSTALL="$ORIG_POLDEK_INSTALL"
 }
 

================================================================
Index: poldek/poldek/install3/obsoletes.c
diff -u poldek/poldek/install3/obsoletes.c:1.6 poldek/poldek/install3/obsoletes.c:1.7
--- poldek/poldek/install3/obsoletes.c:1.6	Tue May 13 18:25:09 2008
+++ poldek/poldek/install3/obsoletes.c	Wed Oct 28 21:53:06 2009
@@ -129,8 +129,8 @@
     if (pkg_is_colored_like(&dbpkg, pkg))
         return 1;
 
-    /* both uncolored -> rpm will replace one with another  */
-    if (dbpkg.color == 0 && pkg->color == 0)
+    /* any uncolored -> rpm allows upgrade */
+    if (dbpkg.color == 0 || pkg->color == 0)
         return 1;
     
     return 0;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/tests/sh/07-depsolver?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/install3/obsoletes.c?r1=1.6&r2=1.7&f=u