X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontents.py;h=ebeb2bc765b426e3c1ff3f271e4a5753ffca8d45;hb=5060396984d61d74c89b73e30604f3fcb5978201;hp=c0713c75fdfb422b6a37795fb5717cc2b64afde0;hpb=5efa82582ac6a5673c14f7d0a9283078a9f9700b;p=dak.git diff --git a/dak/contents.py b/dak/contents.py index c0713c75..ebeb2bc7 100755 --- a/dak/contents.py +++ b/dak/contents.py @@ -283,9 +283,9 @@ class Contents(object): log.debug( "scanning: %s" % (deb[1]) ) debfile = os.path.join( pooldir, deb[1] ) if os.path.exists( debfile ): - Binary(debfile, self.reject).scan_package( deb[0] ) + Binary(debfile, self.reject).scan_package(deb[0],True) else: - log.error( "missing .deb: %s" % deb[1] ) + log.error("missing .deb: %s" % deb[1]) def generate(self): """ @@ -377,6 +377,14 @@ def main(): 'cruft' : Contents.cruft, } + args = apt_pkg.ParseCommandLine(cnf.Cnf, arguments,sys.argv) + + if (len(args) < 1) or not commands.has_key(args[0]): + usage() + + if cnf.has_key("%s::%s" % (options_prefix,"Help")): + usage() + level=logging.INFO if cnf.has_key("%s::%s" % (options_prefix,"Quiet")): level=logging.ERROR @@ -389,14 +397,6 @@ def main(): format='%(asctime)s %(levelname)s %(message)s', stream = sys.stderr ) - args = apt_pkg.ParseCommandLine(cnf.Cnf, arguments,sys.argv) - - if (len(args) < 1) or not commands.has_key(args[0]): - usage() - - if cnf.has_key("%s::%s" % (options_prefix,"Help")): - usage() - commands[args[0]](Contents()) if __name__ == '__main__':