From a3510090e4b7c473fecf4e58f5a21e9321453beb Mon Sep 17 00:00:00 2001 From: Mike McLean Date: May 22 2017 16:09:06 +0000 Subject: Merge #3 `Better error reporting for koji-inheritance-replace` --- diff --git a/src/bin/koji-inheritance-replace b/src/bin/koji-inheritance-replace index 3d195c5..09f6732 100755 --- a/src/bin/koji-inheritance-replace +++ b/src/bin/koji-inheritance-replace @@ -8,7 +8,8 @@ from optparse import OptionParser def run(command): print command rv, output = commands.getstatusoutput(command) - assert not rv + if rv: + raise RuntimeError("Error when running: '%s': %s" % (command, output)) return output @@ -30,7 +31,9 @@ def main(args): if len(parts) == 4 and parts[2] == args[2]: priority = int(parts[0]) break - assert priority is not None, output + if priority is None: + raise RuntimeError("Cannot find inheritance priority for tag '%s'. " + "Is the tag inherited?" % args[2]) run("%s remove-tag-inheritance %s %s" % (opts.profile, args[1], args[2])) run("%s add-tag-inheritance --priority %s %s %s" % (opts.profile, priority, args[1], args[3]))