From 2b9954aece88d1d9e83c7358f68060a5e2440f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Thu, 6 Jul 2006 20:16:00 +0000 Subject: [PATCH] add --ignore-file-conflicts to upgrade and build/emerge commands... --- pisi/cli/commands.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 9b21f9d5..c005d7be 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -386,6 +386,8 @@ unpack, setup, build, install, package. help=_("bypass errors from ActionsAPI")) self.parser.add_option("-S", "--bypass-safety", action="store_true", default=False, help=_("bypass safety switch")) + self.parser.add_option("", "--ignore-file-conflicts", action="store_true", + default=False, help=_("Ignore file conflicts")) self.parser.add_option("-B", "--ignore-comar", action="store_true", default=False, help=_("bypass comar configuration agent")) self.parser.add_option("", "--create-static", action="store_true", @@ -561,6 +563,8 @@ expanded to package names. default=False, help=_("select only security upgrades")) p.add_option("-r", "--bypass-update-repo", action="store_true", default=False, help=_("Do not update repositories")) + p.add_option("", "--ignore-file-conflicts", action="store_true", + default=False, help=_("Ignore file conflicts")) p.add_option("-e", "--eager", action="store_true", default=False, help=_("eager upgrades"))