rendered paste body--- lib/depends.c 2009-05-23 03:09:18.000000000 +1200
+++ lib/depends.c.new 2010-09-01 15:15:17.141000041 +1200
@@ -1556,6 +1556,7 @@
int dirname_deps;
int symlink_deps;
#endif
+ int dirname_deps_warn_only;
requires = rpmdsInit(requires);
if (requires != NULL)
@@ -1657,7 +1658,10 @@
case 0: /* requirements are satisfied. */
/*@switchbreak@*/ break;
case 1: /* requirements are not satisfied. */
- { fnpyKey * suggestedKeys = NULL;
+ dirname_deps_warn_only = rpmExpandNumeric("%{?_dirname_deps_is_warning}%{?!_dirname_deps_is_warning:1}");
+ if (dirname_deps_warn_only) {
+ rpmdsNotify(dirnames, _("(unpackaged parentdir)"), rc);
+ } else { fnpyKey * suggestedKeys = NULL;
if (ts->availablePackages != NULL) {
suggestedKeys = rpmalAllSatisfiesDepend(ts->availablePackages,
@@ -1665,9 +1669,9 @@
}
rpmdsProblem(ps, pkgNEVRA, dirnames, suggestedKeys, adding);
+ ourrc = 1;
}
- ourrc = 1;
/*@switchbreak@*/ break;
case 2: /* something went wrong! */
default: