Removed unused dist arguments

inclement · inclement · commit 3319b445f9ce · 2016-07-02T00:47:49.000+01:00
diff --git a/pythonforandroid/distribution.py b/pythonforandroid/distribution.py
@@ -41,9 +41,9 @@ def __repr__(self):
         return str(self)
 
     @classmethod
-    def get_distribution(cls, ctx, name=None, recipes=[], allow_download=True,
+    def get_distribution(cls, ctx, name=None, recipes=[], 
                          force_build=False,
-                         allow_build=True, extra_dist_dirs=[],
+                         extra_dist_dirs=[],
                          require_perfect_match=False):
         '''Takes information about the distribution, and decides what kind of
         distribution it will be.
@@ -59,11 +59,6 @@ def get_distribution(cls, ctx, name=None, recipes=[], allow_download=True,
             exists, it will be used.
         recipes : list
             The recipes that the distribution must contain.
-        allow_download : bool
-            Whether binary dists may be downloaded.
-        allow_build : bool
-            Whether the distribution may be built from scratch if necessary.
-            This is always False on e.g. Windows.
         force_download: bool
             If True, only downloaded dists are considered.
         force_build : bool
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -102,8 +102,6 @@ def dist_from_args(ctx, dist_args):
         ctx,
         name=dist_args.dist_name,
         recipes=split_argument_list(dist_args.requirements),
-        allow_download=False,  # TODO: remove
-        allow_build=dist_args.allow_build,
         extra_dist_dirs=split_argument_list(dist_args.extra_dist_dirs),
         require_perfect_match=dist_args.require_perfect_match)
 
@@ -535,16 +533,6 @@ def __init__(self):
             help='The bootstrap to build with. Leave unset to choose automatically.',
             default=None)
 
-        add_boolean_option(
-            generic_parser, ["allow-download"],
-            default=False,
-            description='Whether to allow binary dist download:')
-
-        add_boolean_option(
-            generic_parser, ["allow-build"],
-            default=True,
-            description='Whether to allow compilation of a new distribution:')
-
         add_boolean_option(
             generic_parser, ["force-build"],
             default=False,
@@ -681,21 +669,23 @@ def __init__(self):
             parents=[generic_parser])
 
         print('ready to parse', sys.argv[1:])
-        args = parser.parse_args(sys.argv[1:])
+        args, unknown = parser.parse_known_args(sys.argv[1:])
+        args.unknown_args = unknown
         print('args are', args)
 
         setup_color(args.color)
 
         # strip version from requirements, and put them in environ
-        requirements = []
-        for requirement in split_argument_list(args.requirements):
-            if "==" in requirement:
-                requirement, version = requirement.split(u"==", 1)
-                os.environ["VERSION_{}".format(requirement)] = version
-                info('Recipe {}: version "{}" requested'.format(
-                    requirement, version))
-            requirements.append(requirement)
-        args.requirements = u",".join(requirements)
+        if hasattr(args, 'requirements'):
+            requirements = []
+            for requirement in split_argument_list(args.requirements):
+                if "==" in requirement:
+                    requirement, version = requirement.split(u"==", 1)
+                    os.environ["VERSION_{}".format(requirement)] = version
+                    info('Recipe {}: version "{}" requested'.format(
+                        requirement, version))
+                requirements.append(requirement)
+            args.requirements = u",".join(requirements)
 
         self.ctx = Context()
         self.storage_dir = args.storage_dir
@@ -845,7 +835,7 @@ def export_dist(self, args):
         and can use the apk command instead.
         '''
         ctx = self.ctx
-        dist = dist_from_args(ctx, self.dist_args)
+        dist = dist_from_args(ctx, args)
         if dist.needs_build:
             info('You asked to export a dist, but there is no dist '
                  'with suitable recipes available. For now, you must '
@@ -918,7 +908,7 @@ def apk(self, args):
 
         build = imp.load_source('build', join(dist.dist_dir, 'build.py'))
         with current_directory(dist.dist_dir):
-            build_args = build.parse_args(args)
+            build_args = build.parse_args(args.unknown_args)
             output = shprint(sh.ant, apk_args.build_mode, _tail=20, _critical=True, _env=env)
 
         info_main('# Copying APK to current directory')
@@ -1049,7 +1039,7 @@ def adb(self, args):
     def logcat(self, args):
         '''Runs ``adb logcat`` using the adb binary from the detected SDK
         directory. All extra args are passed as arguments to logcat.'''
-        self.adb(['logcat'] + args)
+        self.adb(['logcat'] + args.unknown_args)
 
     def build_status(self, args):
 
