diff options
Diffstat (limited to 'src/dh_xul-ext')
| -rwxr-xr-x | src/dh_xul-ext | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/dh_xul-ext b/src/dh_xul-ext index 832ba9b..8413b3f 100755 --- a/src/dh_xul-ext +++ b/src/dh_xul-ext @@ -15,10 +15,8 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. import csv -import glob import optparse import os -import subprocess import sys from moz_version import compare_versions, convert_moz_to_debian_version @@ -27,7 +25,7 @@ import RDF # error codes COMMAND_LINE_SYNTAX_ERROR = 1 -MULTIPLE_INSTALL_RDFs = 2 +MULTIPLE_INSTALL_RDFS = 2 class XulApp(object): def __init__(self, xul_id, package, sol, eol): @@ -85,7 +83,7 @@ def get_supported_apps(script_name, xul_apps, install_rdf, package, id_max_min = [] model = RDF.Model() parser = RDF.Parser(name="rdfxml") - stream = parser.parse_into_model(model, "file:" + install_rdf) + parser.parse_into_model(model, "file:" + install_rdf) query = RDF.Query( """ PREFIX em: <http://www.mozilla.org/2004/em-rdf#> @@ -170,7 +168,8 @@ def get_provided_package_names(package, supported_apps): lines = open("debian/rules").readlines() lines = filter(lambda x: x.find("MOZ_XPI_EXT_NAME") != -1, lines) if len(lines) > 0: - ext_name = lines[-1][line.find("=")+1:].strip() + line = lines[-1] + ext_name = line[line.find("=")+1:].strip() provides = set() provides.add("xul-ext-" + ext_name) @@ -216,7 +215,7 @@ def generate_substvars(script_name, xul_apps, package, verbose=False): basepath_len = len(os.path.realpath("debian/" + package)) rdfs = map(lambda x: x[basepath_len:], install_rdfs) print >> sys.stderr, "\n".join(rdfs) - sys.exit(MULTIPLE_INSTALL_RDFs) + sys.exit(MULTIPLE_INSTALL_RDFS) install_rdf = install_rdfs.pop() filename = "debian/" + package + ".substvars" @@ -274,7 +273,7 @@ class UnknownOptionIgnoringOptionParser(optparse.OptionParser): optparse.OptionParser._process_short_opts(self, rargs, values) -if __name__ == "__main__": +def main(): script_name = os.path.basename(sys.argv[0]) epilog = "See %s(1) for more info." % (script_name) parser = UnknownOptionIgnoringOptionParser(epilog=epilog) @@ -284,7 +283,7 @@ if __name__ == "__main__": parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="print more information") - (options, args) = parser.parse_args() + options = parser.parse_args()[0] if len(options.packages) == 0: options.packages = get_all_packages() @@ -303,3 +302,6 @@ if __name__ == "__main__": for package in options.packages: generate_substvars(script_name, xul_apps, package, options.verbose) + +if __name__ == "__main__": + main() |