|
 |
5b4f08 |
commit 744cf9259ccec046a15ab5372270d931b7d74fc9
|
|
|
5b4f08 |
Author: Valentina Mukhamedzhanova <vmukhame@redhat.com>
|
|
|
5b4f08 |
Date: Thu Jul 2 16:21:22 2015 +0200
|
|
|
5b4f08 |
|
|
|
5b4f08 |
yum-builddep: respect --tolerant to ignore missing dependencies
|
|
|
5b4f08 |
|
|
|
5b4f08 |
diff --git a/yum-builddep.py b/yum-builddep.py
|
|
|
5b4f08 |
index 7c40713..5f59ab8 100755
|
|
|
5b4f08 |
--- a/yum-builddep.py
|
|
|
5b4f08 |
+++ b/yum-builddep.py
|
|
|
5b4f08 |
@@ -145,7 +145,7 @@ class YumBuildDep(YumUtilBase):
|
|
|
5b4f08 |
self.logger.info('Enabling %s repository' % r.id)
|
|
|
5b4f08 |
r.enable()
|
|
|
5b4f08 |
|
|
|
5b4f08 |
- def install_deps(self, deplist):
|
|
|
5b4f08 |
+ def install_deps(self, deplist, opts):
|
|
|
5b4f08 |
errors = set()
|
|
|
5b4f08 |
for dep in deplist:
|
|
|
5b4f08 |
self.logger.debug(' REQ: %s' % dep)
|
|
|
5b4f08 |
@@ -165,7 +165,8 @@ class YumBuildDep(YumUtilBase):
|
|
|
5b4f08 |
if errors:
|
|
|
5b4f08 |
for i in sorted(errors):
|
|
|
5b4f08 |
self.logger.error("Error: %s" % i)
|
|
|
5b4f08 |
- sys.exit(1)
|
|
|
5b4f08 |
+ if not opts.tolerant:
|
|
|
5b4f08 |
+ sys.exit(1)
|
|
|
5b4f08 |
|
|
|
5b4f08 |
# go through each of the pkgs, figure out what they are/where they are
|
|
|
5b4f08 |
# if they are not a local package then run
|
|
|
5b4f08 |
@@ -226,7 +227,7 @@ class YumBuildDep(YumUtilBase):
|
|
|
5b4f08 |
|
|
|
5b4f08 |
for srpm in toActOn:
|
|
|
5b4f08 |
self.logger.info('Getting requirements for %s' % srpm)
|
|
|
5b4f08 |
- self.install_deps(srpm.requiresList())
|
|
|
5b4f08 |
+ self.install_deps(srpm.requiresList(), opts)
|
|
|
5b4f08 |
|
|
|
5b4f08 |
for name in specnames:
|
|
|
5b4f08 |
# (re)load rpm config for target if set
|
|
|
5b4f08 |
@@ -248,7 +249,7 @@ class YumBuildDep(YumUtilBase):
|
|
|
5b4f08 |
buildreqs.append(d.DNEVR()[2:])
|
|
|
5b4f08 |
|
|
|
5b4f08 |
self.logger.info('Getting requirements for %s' % name)
|
|
|
5b4f08 |
- self.install_deps(buildreqs)
|
|
|
5b4f08 |
+ self.install_deps(buildreqs, opts)
|
|
|
5b4f08 |
|
|
|
5b4f08 |
if __name__ == '__main__':
|
|
|
5b4f08 |
setup_locale()
|