diff --git a/cmsBuild b/cmsBuild index 6bc9905..da9b749 100755 --- a/cmsBuild +++ b/cmsBuild @@ -1,6 +1,6 @@ #!/usr/bin/python3 -u # Driver script for building rpms from a configuration specified in CMSDIST. -# +# test2 import sys, socket from os.path import abspath, join, exists, isdir, basename, dirname from os import popen, getenv, symlink, listdir, readlink, unlink, getpid @@ -2584,6 +2584,8 @@ class Package(object): checksumCalculator.addStrings(PKGFactory.sectionPreambles.values()) checksumCalculator.addStrings(list(PKGFactory.sectionPostambles.values()) + [self.installPostambles]) + if self.versionSuffix and (self.options.tag == "hash"): + checksumCalculator.addString("force rebuild test1") if self.name in cms_debug_packages: checksumCalculator.addString("cms_debug_packages=%s" % ",".join(sorted(cms_debug_packages[self.name]))) @@ -4000,6 +4002,8 @@ def checkDeps(pkg, requires, scheduler): if p == pkg_name: continue found[p] = 1 print("Missing ",pkg.name,missing) + if missing: + raise RpmBuildFailed(pkg) scheduler.log("Done checking package dependencies: %s" % pkg.pkgName()) return