From c952e012643922d5c51507d5fa9fa8a481a8384e Mon Sep 17 00:00:00 2001 From: Till Maas Date: Oct 07 2015 21:10:22 +0000 Subject: Add more standard reasons to fedretire Signed-off-by: Till Maas --- diff --git a/scripts/fedretire b/scripts/fedretire index 34c4c64..cc98000 100755 --- a/scripts/fedretire +++ b/scripts/fedretire @@ -13,6 +13,12 @@ ORPHAN_REASON = """Retired orphaned package, because it was orphaned for more than six weeks. """ +ORPHAN_DEPENDENT_REASON = """Retired because it depends on {package}, which was +retired, because it was orphaned for more than six weeks. +""" + +ORPHAN_NOT_BUILT = """Retired orphaned package, because it was not built.""" + def retire(pkg, branch, reason, dryrun=False): def run(cmd, cwd): @@ -45,10 +51,26 @@ if __name__ == "__main__": parser.add_argument("--reason", default=None) parser.add_argument("--orphan", default=False, action="store_true", help="Use reason for orphaned packages") + parser.add_argument( + "--orphan-dependent", default=None, + help="Use reason for package depending on orphaned package") + parser.add_argument("--unbuilt-orphan", default=False, action="store_true", + help="Use reason for unbuilt orphaned package") parser.add_argument("pkg", nargs="+") args = parser.parse_args() - if args.reasonfile is None and args.reason is None and not args.orphan: + if args.reasonfile is not None: + with open(args.reasonfile, "rb") as reasonfile: + reason = reasonfile.read() + elif args.reason: + reason = args.reason + elif args.orphan: + reason = ORPHAN_REASON + elif args.orphan_dependent: + reason = ORPHAN_DEPENDENT_REASON.format(package=args.orphan_dependent) + elif args.unbuilt_orphan: + reason = ORPHAN_NOT_BUILT + else: reasonfile = tempfile.NamedTemporaryFile(delete=False) filename = reasonfile.name childpid = os.fork() @@ -58,13 +80,6 @@ if __name__ == "__main__": os.waitpid(childpid, 0) reason = reasonfile.read() os.unlink(filename) - elif args.reasonfile is not None: - with open(args.reasonfile, "rb") as reasonfile: - reason = reasonfile.read() - elif args.reason: - reason = args.reason - elif args.orphan: - reason = ORPHAN_REASON date = datetime.datetime.now().strftime("%Y-%m-%d: ") if not reason.startswith(date):