diff options
author | Mike Bonnet <mikeb@redhat.com> | 2009-02-01 09:52:48 -0600 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2009-02-01 09:52:48 -0600 |
commit | 453168942081b2d073504016fe4d1c1be0b6ab55 (patch) | |
tree | c7c08d468e62f3b84145d50f9ffbf2dc072f8703 /py | |
parent | ebbe33562c7d66108ef33771cc43ce8b3f4d5583 (diff) | |
download | mock-453168942081b2d073504016fe4d1c1be0b6ab55.tar.gz mock-453168942081b2d073504016fe4d1c1be0b6ab55.tar.xz mock-453168942081b2d073504016fe4d1c1be0b6ab55.zip |
buildsrpm: some additional sanity checking, and removing an unnecessary glob
Diffstat (limited to 'py')
-rw-r--r-- | py/mock/backend.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/py/mock/backend.py b/py/mock/backend.py index e34f451..2bc63df 100644 --- a/py/mock/backend.py +++ b/py/mock/backend.py @@ -481,15 +481,15 @@ class Root(object): ) rebuiltSrpmFile = glob.glob("%s/%s/SRPMS/*.src.rpm" % (self.makeChrootPath(), self.builddir)) - if len(rebuiltSrpmFile) != 1: - raise mock.exception.PkgError, "Didnt find single rebuilt srpm." + if len(rebuiltSrpmFile) == 0: + raise mock.exception.PkgError, "No rebuilt srpms found" + elif len(rebuiltSrpmFile) > 1: + raise mock.exception.PkgError, "Multiple rebuilt srpms found" rebuiltSrpmFile = rebuiltSrpmFile[0] - srpms = glob.glob(self.makeChrootPath(self.builddir) + '/SRPMS/*.rpm') - self.root_log.debug("Copying packages to result dir") - for item in srpms: - shutil.copy2(item, self.resultdir) + self.root_log.debug("Copying package to result dir") + shutil.copy2(rebuiltSrpmFile, self.resultdir) finally: self.uidManager.restorePrivs() |