poldek: poldek/pm/rpm/rpm_pkg_ld.c - #ifdefs hell

mis mis at pld-linux.org
Thu Jun 21 21:33:31 CEST 2007


Author: mis                          Date: Thu Jun 21 19:33:31 2007 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- #ifdefs hell

---- Files affected:
poldek/poldek/pm/rpm:
   rpm_pkg_ld.c (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: poldek/poldek/pm/rpm/rpm_pkg_ld.c
diff -u poldek/poldek/pm/rpm/rpm_pkg_ld.c:1.14 poldek/poldek/pm/rpm/rpm_pkg_ld.c:1.15
--- poldek/poldek/pm/rpm/rpm_pkg_ld.c:1.14	Thu Jun 21 18:47:45 2007
+++ poldek/poldek/pm/rpm/rpm_pkg_ld.c	Thu Jun 21 21:33:26 2007
@@ -1,6 +1,6 @@
 /* 
-  Copyright (C) 2000 Pawel A. Gajda (mis at k2.net.pl)
- 
+  Copyright (C) 2000 - 2007 Pawel A. Gajda <mis at pld-linux.org> 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License published by
   the Free Software Foundation (see file COPYING for details).
@@ -65,15 +65,15 @@
 #else
                 
 #  if RPMSENSE_PREREQ != RPMSENSE_ANY /* rpm 4.4 drops legacy PreReq support */
-    if (isLegacyPreReq(flag)) /* prepared by rpm < 4.0.2  */
+    if (isLegacyPreReq(rpmflags)) /* prepared by rpm < 4.0.2  */
         rflags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN;
     
     else
 #  endif
-		if (isInstallPreReq(flag))
+		if (isInstallPreReq(rpmflags))
             rflags |= CAPREQ_PREREQ;
     
-    if (isErasePreReq(flag))
+    if (isErasePreReq(rpmflags))
         rflags |= CAPREQ_PREREQ_UN;
     
     DBGFIF(rflags & (CAPREQ_PREREQ | CAPREQ_PREREQ_UN),
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/poldek/poldek/pm/rpm/rpm_pkg_ld.c?r1=1.14&r2=1.15&f=u



More information about the pld-cvs-commit mailing list