From 497177760b1de7d3a357176734e3b1b557523590 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Thu, 25 Aug 2011 14:30:30 +0200 Subject: [PATCH] Allow --force ing a blacklist override, when doing a non-native sync --- syncpackage | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/syncpackage b/syncpackage index 3c7e8ba..1624c5d 100755 --- a/syncpackage +++ b/syncpackage @@ -469,7 +469,8 @@ def main(): "upload.") parser.add_option("-f", "--force", dest="force", action="store_true", default=False, - help="Force sync over the top of Ubuntu changes.") + help="Force sync over the top of Ubuntu changes " + "or a fake-sync when blacklisted.") parser.add_option('-D', '--debian-mirror', metavar='DEBIAN_MIRROR', dest='debian_mirror', help='Preferred Debian mirror ' @@ -552,7 +553,12 @@ def main(): Logger.error("If you think this package shouldn't be blacklisted, " "please file a bug explaining your reasoning and " "subscribe ~ubuntu-archive.") - sys.exit(1) + if options.force and not options.lp: + Logger.warning(u"Forcing fake-sync, overriding blacklist") + else: + Logger.error("--force and --no-lp are required to override the " + "blacklist, if this package needs a fakesync") + sys.exit(1) if options.lp: copy(src_pkg, options.release, options.simulate, options.force)