25f00b6cb5
Copy from Base:System/rpm based on submit request 18841 from user mlschroe OBS-URL: https://build.opensuse.org/request/show/18841 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=84
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
Obey MISSINGOK flag for dependencies. Backport from rpm-4.4.7.
|
|
|
|
Index: lib/depends.c
|
|
===================================================================
|
|
--- lib/depends.c.orig
|
|
+++ lib/depends.c
|
|
@@ -518,8 +518,13 @@ retry:
|
|
}
|
|
|
|
unsatisfied:
|
|
- rc = 1; /* dependency is unsatisfied */
|
|
- rpmdsNotify(dep, NULL, rc);
|
|
+ if (rpmdsFlags(dep) & RPMSENSE_MISSINGOK) {
|
|
+ rc = 0; /* dependency is unsatisfied, but just a hint. */
|
|
+ rpmdsNotify(dep, _("(hint skipped)"), rc);
|
|
+ } else {
|
|
+ rc = 1; /* dependency is unsatisfied */
|
|
+ rpmdsNotify(dep, NULL, rc);
|
|
+ }
|
|
|
|
exit:
|
|
/*
|
|
@@ -827,6 +832,8 @@ static inline const char * identifyDepen
|
|
return "Requires(postun):";
|
|
if (f & RPMSENSE_SCRIPT_VERIFY)
|
|
return "Requires(verify):";
|
|
+ if (f & RPMSENSE_MISSINGOK)
|
|
+ return "Requires(hint):";
|
|
if (f & RPMSENSE_FIND_REQUIRES)
|
|
return "Requires(auto):";
|
|
return "Requires:";
|
|
Index: lib/rpmds.h
|
|
===================================================================
|
|
--- lib/rpmds.h.orig
|
|
+++ lib/rpmds.h
|
|
@@ -73,6 +73,7 @@ typedef enum rpmsenseFlags_e {
|
|
RPMSENSE_SCRIPT_POSTUN | \
|
|
RPMSENSE_SCRIPT_VERIFY | \
|
|
RPMSENSE_FIND_REQUIRES | \
|
|
+ RPMSENSE_MISSINGOK | \
|
|
RPMSENSE_SCRIPT_PREP | \
|
|
RPMSENSE_SCRIPT_BUILD | \
|
|
RPMSENSE_SCRIPT_INSTALL | \
|