scripts: Drop interactive flag

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/scripts/pakfire-builder.in b/src/scripts/pakfire-builder.in
index 0bd7bc373bdf4420487d7ec0616f89ef3cda13a1..5e72469b0b2a7e0ae793755952cec1c93d859cb4 100644 (file)
--- a/src/scripts/pakfire-builder.in
+++ b/src/scripts/pakfire-builder.in
@@ -55,8 +55,6 @@ class Cli(object):
                        help=_("Build ID"))
                build.add_argument("--resultdir", nargs="?",
                        help=_("Path were the output files should be copied to"))
-               build.add_argument("--non-interactive", action="store_false", dest="interactive",
-                       help=_("Run in non-interactive mode"))
                build.add_argument("--after-shell", action="store_true",
                        help=_("Run a shell after a successful build"))
                build.add_argument("--skip-install-test", action="store_true",
@@ -141,7 +139,7 @@ class Cli(object):
 
                return args
 
-       def pakfire(self, ns, build=True, interactive=True):
+       def pakfire(self, ns, build=True):
                # Find distro configuration file
                conf = os.path.join(CONFIG_DISTRO_DIR, "%s.conf" % ns.distro)
 
@@ -158,7 +156,6 @@ class Cli(object):
 
                        # Set up logging
                        logger=logger.log,
-                       interactive=interactive,
 
                        # Enable build mode
                        build=build,
@@ -197,7 +194,7 @@ class Cli(object):
 
                try:
                        # Initialise a builder instance and build this package
-                       p = self.pakfire(ns, interactive=ns.interactive)
+                       p = self.pakfire(ns)
 
                        # Package any makefiles
                        if package.endswith(".nm"):

diff --git a/src/scripts/pakfire.in b/src/scripts/pakfire.in
index 363cb29e34b67cf6c0e44638ca8fb9a5cc011e33..330087c97591c83ed6f7baa2204bf067f5852d6b 100644 (file)
--- a/src/scripts/pakfire.in
+++ b/src/scripts/pakfire.in
@@ -246,7 +246,6 @@ class Cli(object):
                        conf=args.config,
                        arch=args.arch,
                        path=args.root,
-                       interactive=True,
                        offline=args.offline,
                )