X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/59f0d218a6ff34c80cf898f6d7ac62555ba8eb11..379db8b623ff6ea109b7f0e7a3c72abe09eb6b98:/buildorder.py

diff --git a/buildorder.py b/buildorder.py
index 5aeedd93..1cd6f3d4 100755
--- a/buildorder.py
+++ b/buildorder.py
@@ -3,13 +3,9 @@
 
 import os, sys
 
-def die(msg):
-	print('ERROR: ' + msg)
-	sys.exit(1)
+def die(msg): sys.exit('ERROR: ' + msg)
 
-if len(sys.argv) != 2: die("Supply path to packages directory as first and only argument")
-packages_dir = sys.argv[1]
-if not os.path.isdir(packages_dir): die(packages_dir + ' is not a directory')
+if len(sys.argv) != 1: die('buildorder.py takes no arguments')
 
 class DebianPackage:
 	def __init__(self, name):
@@ -21,6 +17,7 @@ class DebianPackage:
 all_packages = [] # List of all DebianPackage:s
 packages_map = {} # Mapping from package name to DebianPackage (if subpackage, mapping from subpackage name to parent package)
 
+packages_dir = 'packages'
 for subdir_name in sorted(os.listdir(packages_dir)):
 	subdir_path = packages_dir + '/' + subdir_name
 	if os.path.exists(subdir_path + '/BROKEN.txt'): continue
@@ -37,7 +34,7 @@ for subdir_name in sorted(os.listdir(packages_dir)):
 				deps_comma_separated = line[(line.index('=')+2):(len(line)-2)]
 				for dep in deps_comma_separated.split(','):
 					dep = dep.strip()
-					this_package.remaining_dependencies.add(dep)
+					if not dep.endswith('libandroid-support-dev'): this_package.remaining_dependencies.add(dep)
 	for file_in_subdir_name in sorted(os.listdir(subdir_path)):
 		if file_in_subdir_name.endswith('.subpackage.sh'):
 			subpackage_name = file_in_subdir_name[0:-len(".subpackage.sh"):]