Add new server commands.

diff --git a/pakfire/cli.py b/pakfire/cli.py
index 4f1693c3b2c6880becbc61a1c636cc5159ed3f8d..7777edab9dd80840c3a89dcc4c3806922e4ce5ed 100644 (file)
--- a/pakfire/cli.py
+++ b/pakfire/cli.py
@@ -331,10 +331,10 @@ class CliBuilder(Cli):
 
                self.pakfire.dist(pkgs, resultdirs=[self.args.resultdir,])
 
-class CliServer(Cli):
+class CliRepo(Cli):
        def __init__(self):
                self.parser = argparse.ArgumentParser(
-                       description = _("Pakfire server command line interface."),
+                       description = _("Pakfire repo command line interface."),
                )
 
                self.parse_common_arguments()
@@ -376,3 +376,12 @@ class CliServer(Cli):
                path = self.args.path[0]
 
                self.pakfire.repo_create(path, self.args.inputs)
+
+
+class CliMaster(Cli):
+       pass
+
+
+class CliSlave(Cli):
+       pass
+

diff --git a/scripts/pakfire b/scripts/pakfire
index b5063f463021b43570161f375566e4b1312a1aee..b7dc1f5370d51435be609746d68964ed931ee9bf 100755 (executable)
--- a/scripts/pakfire
+++ b/scripts/pakfire
@@ -4,12 +4,14 @@ import logging
 import os
 import sys
 
-from pakfire.cli import Cli, CliBuilder, CliServer
+from pakfire.cli import *
 
 basename2cls = {
        "pakfire" : Cli,
        "pakfire-build" : CliBuilder,
-       "pakfire-server" : CliServer,
+       "pakfire-master" : CliMaster,
+       "pakfire-repo" : CliRepo,
+       "pakfire-slave" : CliSlave,
 }
 
 # Get the basename of the program

diff --git a/scripts/pakfire-server b/scripts/pakfire-master
similarity index 100%
rename from scripts/pakfire-server
rename to scripts/pakfire-master

diff --git a/scripts/pakfire-repo b/scripts/pakfire-repo
new file mode 120000 (symlink)
index 0000000..83bb50a
--- /dev/null
+++ b/scripts/pakfire-repo
@@ -0,0 +1 @@
+pakfire
\ No newline at end of file

diff --git a/scripts/pakfire-slave b/scripts/pakfire-slave
new file mode 120000 (symlink)
index 0000000..83bb50a
--- /dev/null
+++ b/scripts/pakfire-slave
@@ -0,0 +1 @@
+pakfire
\ No newline at end of file

diff --git a/setup.py b/setup.py
index db0121ac04acf6996364dc039454bafc78cb6e6c..8338427efad7c2530c783d01186c92a2ffd8258f 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,13 @@ setup(
        author_email = "info@ipfire.org",
        url = "http://redmine.ipfire.org/projects/buildsystem3",
        packages = ["pakfire", "pakfire.packages", "pakfire.plugins", "pakfire.repository",],
-       scripts = ["scripts/pakfire", "scripts/pakfire-build", "scripts/pakfire-server"],
+       scripts = [
+               "scripts/pakfire",
+               "scripts/pakfire-build",
+               "scripts/pakfire-master",
+               "scripts/pakfire-repo",
+               "scripts/pakfire-slave",
+       ],
        cmdclass = { "build" : build_extra.build_extra,
                     "build_i18n" :  build_i18n.build_i18n },
 )