RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 25-Mar-2011 15:33:34 Branch: rpm-5_3 Handle: 2011032514333400 Modified files: (Branch: rpm-5_3) rpm/lib psm.c Log: fix mandriva hack to workaround file triggers issue Summary: Revision Changes Path 2.394.2.8 +2 -4 rpm/lib/psm.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/lib/psm.c ============================================================================ $ cvs diff -u -r2.394.2.7 -r2.394.2.8 psm.c --- rpm/lib/psm.c 24 Mar 2011 16:55:06 -0000 2.394.2.7 +++ rpm/lib/psm.c 25 Mar 2011 14:33:34 -0000 2.394.2.8 @@ -1489,17 +1489,15 @@ * there doesn't seem to be any reason to fire the same trigger * over and over.. */ - if(tagno == RPMTAG_BASENAMES || RPMTAG_DIRNAMES) + if(tagno == RPMTAG_BASENAMES || tagno == RPMTAG_DIRNAMES) break; - xx = argiAdd(&instances, -1, instance); - xx = argiSort(instances, NULL); #endif } mi = rpmmiFree(mi); #if defined(RPM_VENDOR_MANDRIVA) /* again don't fire same trigger over and over.. */ - if(tagno == RPMTAG_BASENAMES || RPMTAG_DIRNAMES) + if(tagno == RPMTAG_BASENAMES || tagno == RPMTAG_DIRNAMES) break; #endif } @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org