RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 21-Dec-2008 09:42:30 Branch: HEAD Handle: 2008122108422901 Modified files: rpm CHANGES rpm/rpmdb rpmevr.c Log: - invert the sense of a <-> b comparison, change sign of Mandriva override. Summary: Revision Changes Path 1.2698 +1 -0 rpm/CHANGES 1.11 +3 -3 rpm/rpmdb/rpmevr.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.2697 -r1.2698 CHANGES --- rpm/CHANGES 20 Dec 2008 23:14:51 -0000 1.2697 +++ rpm/CHANGES 21 Dec 2008 08:42:29 -0000 1.2698 @@ -1,5 +1,6 @@ 5.2a2 -> 5.2a3: + - jbj: invert the sense of a <-> b comparison, change sign of Mandriva override. - jbj: bury MDV file triggers under RPM_VENDOR_MANDRIVA. - jbj: use poptSaneFile() when available (popt-1.15). - jbj: use poptReadConfigFiles() when available (popt-1.15). @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmevr.c ============================================================================ $ cvs diff -u -r1.10 -r1.11 rpmevr.c --- rpm/rpmdb/rpmevr.c 2 Aug 2008 16:36:10 -0000 1.10 +++ rpm/rpmdb/rpmevr.c 21 Dec 2008 08:42:30 -0000 1.11 @@ -21,9 +21,9 @@ /* XXX Force digits to beat alphas. See bugzilla #50977. */ /*...@unchecked@*/ #if defined(RPM_VENDOR_MANDRIVA) /* old-comparision-behaviour */ -static int _invert_digits_alphas_comparison = 1; -#else static int _invert_digits_alphas_comparison = -1; +#else +static int _invert_digits_alphas_comparison = 1; #endif /* XXX Punctuation characters that are not treated as alphas */ @@ -84,7 +84,7 @@ /* Calculate digit comparison return code. */ if (a == ae || b == be) - rc = (int)(*b - *a) * _invert_digits_alphas_comparison; + rc = (int)(*a - *b) * _invert_digits_alphas_comparison; else { rc = (ae - a) - (be - b); if (!rc) @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
