diff --git a/pisi/catbox.patch b/pisi/catbox.patch index b3514d01..1b3911ee 100644 --- a/pisi/catbox.patch +++ b/pisi/catbox.patch @@ -49,42 +49,3 @@ Index: cli/commands.py def add_steps_options(self): group = OptionGroup(self.parser, _("build steps")) -Index: catbox.patch -=================================================================== ---- catbox.patch (revision 10048) -+++ catbox.patch (working copy) -@@ -1,8 +1,8 @@ - Index: build.py - =================================================================== ----- build.py (revision 8935) -+--- build.py (revision 10048) - +++ build.py (working copy) --@@ -197,13 +197,30 @@ -+@@ -193,13 +193,30 @@ - # apply the patches and prepare a source directory for build. - self.apply_patches() - -@@ -38,14 +38,14 @@ - - Index: cli/commands.py - =================================================================== ----- cli/commands.py (revision 8935) -+--- cli/commands.py (revision 10048) - +++ cli/commands.py (working copy) --@@ -396,6 +396,8 @@ -- default=False, help=_("don't install build dependencies, fail if a build dependency is present")) -- self.parser.add_option("-F", "--package-format", action="store", default='1.1', -- help=_("pisi package format")) --+ self.parser.add_option("", "--use-catbox", action="store_true", --+ default=False, help=_("use catbox")) -+@@ -452,6 +452,8 @@ -+ default=False, help=_("Do not install build dependencies, fail if a build dependency is present")) -+ group.add_option("-F", "--package-format", action="store", default='1.1', -+ help=_("PiSi binary package formats: '1.0', '1.1' (default)")) -++ self.parser.add_option("", "--use-catbox", action="store_true", default=False, -++ help=_("use catbox")) - -- def run(self): -- if not self.args: -+ def add_steps_options(self): -+ group = OptionGroup(self.parser, _("build steps"))