- add version check for package with provides and obsoletes.

CVS patchset: 6846
CVS date: 2003/05/15 14:22:30

diff --git a/CHANGES b/CHANGES
index b5fcef4..a6fbd48 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@
        - fix: cut-n-paste error setting nopromote for Conflicts: (#81965).
        - don't use error string after gzclose (Dmitry V. Levin).
        - fix: nested %if handling, optind initialization posix vs. glibc.
+       - add version check for package with provides and obsoletes.
 
 4.1 -> 4.2:
        - set cachesize without a dbenv, the default is far too small.

diff --git a/lib/depends.c b/lib/depends.c
index f303ec3..dd5cbba 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -305,7 +305,8 @@ int rpmtsAddInstallElement(rpmts ts, Header h,
             */
            if (rpmdsEVR(obsoletes) == NULL
             || rpmdsAnyMatchesDep(oh, obsoletes, _rpmds_nopromote))
-               xx = removePackage(ts, oh, rpmdbGetIteratorOffset(mi), pkgKey);
+               if (rpmVersionCompare(h, oh))
+                   xx = removePackage(ts, oh, rpmdbGetIteratorOffset(mi), pkgKey);
        }
        mi = rpmdbFreeIterator(mi);
     }