From e5fe9134275ba12088c66658c14e5bc31d3072b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Mon, 8 May 2006 17:22:21 +0000 Subject: [PATCH] --no-static -> --create-static Don't generate -static packages by default... --- pisi/build.py | 6 +++--- pisi/cli/commands.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index 67c42790..d709df37 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -77,7 +77,7 @@ def check_path_collision(package, pkgList): # collide. Exp: # pinfo.path: /usr/share # path.path: /usr/share/doc - if (path.path.endswith(ctx.const.ar_file_suffix) and not ctx.get_option('no_static')) or \ + if (path.path.endswith(ctx.const.ar_file_suffix) and ctx.get_option('create_static')) or \ (path.path.endswith(ctx.const.debug_file_suffix) and not ctx.get_option('no_debug')): # don't throw collision error for these files. # we'll handle this in gen_files_xml.. @@ -610,7 +610,7 @@ class Builder: def add_path(path): # add the files under material path for fpath, fhash in util.get_file_hashes(path, collisions, install_dir): - if not ctx.get_option('no_static') \ + if ctx.get_option('create_static') \ and fpath.endswith(ctx.const.ar_file_suffix) \ and not package.name.endswith(ctx.const.static_name_suffix) \ and util.is_ar_file(fpath): @@ -726,7 +726,7 @@ class Builder: # Strip install directory before building .pisi packages. self.strip_install_dir() - if not ctx.get_option('no_static'): + if ctx.get_option('create_static'): obj = self.generate_static_package_object() if obj: self.spec.packages.append(obj) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index f4ba4cee..daa374b6 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -364,7 +364,7 @@ unpack, setup, build, install, package help=_("bypass errors from ActionsAPI")) self.parser.add_option("-B", "--ignore-comar", action="store_true", default=False, help=_("bypass comar configuration agent")) - self.parser.add_option("", "--no-static", action="store_true", + self.parser.add_option("", "--create-static", action="store_true", default=False, help=_("don't create a static package with ar files")) self.parser.add_option("", "--no-debug", action="store_true", default=False, help=_("don't create a debug package with debug files"))