Sophie

Sophie

distrib > Mandriva > 2007.1 > i586 > by-pkgid > 2e20fbe220a1d0f48a15d5008a7dd680 > files > 37

rpm-4.4.6-22.1mdv2007.1.src.rpm

--- ./lib/depends.c.no-dirname-dep	2006-06-10 13:31:56.389904493 +0200
+++ ./lib/depends.c	2006-06-10 14:07:51.870054864 +0200
@@ -52,6 +52,8 @@
 /*@unchecked@*/
 int rpmFLAGS = RPMSENSE_EQUAL;
 
+int no_dirname_deps = 1;
+
 /**
  * Compare removed package instances (qsort/bsearch).
  * @param a		1st instance address
@@ -892,6 +894,8 @@
 	}
     }
 
+    if (!no_dirname_deps) {
+
     dirnames = rpmdsInit(dirnames);
     if (dirnames != NULL)
     while (!ourrc && rpmdsNext(dirnames) >= 0) {
@@ -933,6 +937,7 @@
 	    /*@switchbreak@*/ break;
 	}
     }
+    }
 
     return ourrc;
 }
@@ -1916,6 +1921,8 @@
     int xx;
     int rc;
 
+    no_dirname_deps = rpmExpandNumeric("%{?_check_dirnames_deps:0}%{?!_check_dirnames_deps:1}");
+
     (void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_CHECK), 0);
 
     /* Do lazy, readonly, open of rpm database. */