From 9b8755407b5e38ad48cfe937a78e91d08e628f55 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 24 Sep 2011 00:04:02 +0200 Subject: [PATCH] Rename some scripts to reflect what they do. --- Makefile | 7 +++++++ pakfire/builder.py | 2 +- pakfire/cli.py | 2 +- po/pakfire.pot | 6 +++--- scripts/pakfire | 8 ++++---- scripts/pakfire-build2 | 1 - scripts/{pakfire-build => pakfire-builder} | 0 setup.py | 3 +-- 8 files changed, 17 insertions(+), 12 deletions(-) delete mode 120000 scripts/pakfire-build2 rename scripts/{pakfire-build => pakfire-builder} (100%) diff --git a/Makefile b/Makefile index cb76fe409..29d2cffc8 100644 --- a/Makefile +++ b/Makefile @@ -16,10 +16,17 @@ clean: dist: python setup.py sdist +.PHONY: bdist +bdist: + python setup.py bdist + .PHONY: install install: po python setup.py install --root=$(DESTDIR) --prefix=/usr + -mkdir -pv $(DESTDIR)/usr/lib/pakfire + ln -svf ../../bin/pakfire $(DESTDIR)/usr/lib/pakfire/builder + -mkdir -pv $(DESTDIR)/etc/pakfire.repos.d cp -vf examples/pakfire.conf $(DESTDIR)/etc/pakfire.conf cp -vf examples/pakfire.repos.d/* $(DESTDIR)/etc/pakfire.repos.d/ diff --git a/pakfire/builder.py b/pakfire/builder.py index 7787cb800..6ea4997da 100644 --- a/pakfire/builder.py +++ b/pakfire/builder.py @@ -541,7 +541,7 @@ class BuildEnviron(object): resultdir = self.chrootPath("/result") # Create the build command, that is executed in the chroot. - build_command = ["pakfire-build2", "--offline", "build", pkgfile, + build_command = ["/usr/lib/pakfire/builder", "--offline", "build", pkgfile, "--nodeps", "--resultdir=/result",] try: diff --git a/pakfire/cli.py b/pakfire/cli.py index a0355651e..9b698a56d 100644 --- a/pakfire/cli.py +++ b/pakfire/cli.py @@ -573,7 +573,7 @@ class CliServer(Cli): pakfire.repo_create(path, self.args.inputs, **self.pakfire_args) -class CliBuilder2(Cli): +class CliBuilderIntern(Cli): def __init__(self): self.parser = argparse.ArgumentParser( description = _("Pakfire builder command line interface."), diff --git a/po/pakfire.pot b/po/pakfire.pot index 4784c8f3a..3465efc59 100644 --- a/po/pakfire.pot +++ b/po/pakfire.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-10 22:15+0200\n" +"POT-Creation-Date: 2011-09-24 00:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -92,12 +92,12 @@ msgstr "" #. Package the result. #. Make all these little package from the build environment. -#: ../pakfire/builder.py:697 +#: ../pakfire/builder.py:702 msgid "Creating packages:" msgstr "" #. Execute the buildscript of this stage. -#: ../pakfire/builder.py:709 +#: ../pakfire/builder.py:714 #, python-format msgid "Running stage %s:" msgstr "" diff --git a/scripts/pakfire b/scripts/pakfire index 2a742edc8..eb7eea965 100755 --- a/scripts/pakfire +++ b/scripts/pakfire @@ -32,10 +32,10 @@ except ImportError, e: sys.exit(1) basename2cls = { - "pakfire" : Cli, - "pakfire-build" : CliBuilder, - "pakfire-build2" : CliBuilder2, - "pakfire-server" : CliServer, + "pakfire" : Cli, + "pakfire-builder" : CliBuilder, + "pakfire-server" : CliServer, + "builder" : CliBuilderIntern, } # Get the basename of the program diff --git a/scripts/pakfire-build2 b/scripts/pakfire-build2 deleted file mode 120000 index 83bb50a42..000000000 --- a/scripts/pakfire-build2 +++ /dev/null @@ -1 +0,0 @@ -pakfire \ No newline at end of file diff --git a/scripts/pakfire-build b/scripts/pakfire-builder similarity index 100% rename from scripts/pakfire-build rename to scripts/pakfire-builder diff --git a/setup.py b/setup.py index d1dda81ef..841b63e74 100644 --- a/setup.py +++ b/setup.py @@ -29,8 +29,7 @@ setup( ], scripts = [ "scripts/pakfire", - "scripts/pakfire-build", - "scripts/pakfire-build2", + "scripts/pakfire-builder", "scripts/pakfire-server", ], data_files = [ -- 2.39.5