X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Fshow_new.py;h=e87ca89233f19a392707b3a14f3767593ad8b707;hb=87f92d7fed6efc99b8d92aafbf9d1622034e6cd9;hp=a18847cc96d0f76bdc88bdad8cfc2d0f0eacb6ff;hpb=d0a12f9f8e9fe208a277e020d244a55eb6a874c4;p=dak.git diff --git a/dak/show_new.py b/dak/show_new.py index a18847cc..e87ca892 100755 --- a/dak/show_new.py +++ b/dak/show_new.py @@ -28,9 +28,9 @@ import copy, os, sys, time import apt_pkg import examine_package -import daklib.database -import daklib.queue as queue -import daklib.utils +from daklib import database +from daklib import queue +from daklib import utils # Globals Cnf = None @@ -169,7 +169,7 @@ def do_pkg(changes_file): html_header(changes["source"], filestoexamine) queue.check_valid(new) - examine_package.display_changes(Upload.pkg.changes_file) + examine_package.display_changes(changes['distribution'], Upload.pkg.changes_file) for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine): examine_package.check_dsc(fn) @@ -195,7 +195,7 @@ def usage (exit_code=0): def init(): global Cnf, Options, Upload, projectB - Cnf = daklib.utils.get_conf() + Cnf = utils.get_conf() Arguments = [('h',"help","Show-New::Options::Help"), ("p","html-path","Show-New::HTMLPath","HasArg")] @@ -226,7 +226,7 @@ def main(): examine_package.use_html=1 for changes_file in changes_files: - changes_file = daklib.utils.validate_changes_file_arg(changes_file, 0) + changes_file = utils.validate_changes_file_arg(changes_file, 0) if not changes_file: continue print "\n" + changes_file