X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_new.py;h=fc952d2a346d86ba60dc963e35aacb7c0f4c15d0;hb=01496fe710b21e3922ef7b6f3ffa74f2b697b34d;hp=b8550fd10714bc6c1cba83fc19209a44d423e345;hpb=54a1e63df2a81a8f5e6f3148d59afcfeaa7b3495;p=dak.git diff --git a/dak/process_new.py b/dak/process_new.py index b8550fd1..fc952d2a 100755 --- a/dak/process_new.py +++ b/dak/process_new.py @@ -380,17 +380,17 @@ def check_pkg (upload): try: sys.stdout = less_fd changes = utils.parse_changes (upload.pkg.changes_file) - examine_package.display_changes(changes['distribution'], upload.pkg.changes_file) + print examine_package.display_changes(changes['distribution'], upload.pkg.changes_file) files = upload.pkg.files for f in files.keys(): if files[f].has_key("new"): ftype = files[f]["type"] if ftype == "deb": - examine_package.check_deb(changes['distribution'], f) + print examine_package.check_deb(changes['distribution'], f) elif ftype == "dsc": - examine_package.check_dsc(changes['distribution'], f) + print examine_package.check_dsc(changes['distribution'], f) finally: - examine_package.output_package_relations() + print examine_package.output_package_relations() sys.stdout = stdout_fd except IOError, e: if e.errno == errno.EPIPE: @@ -448,14 +448,13 @@ def add_overrides (new, upload, session): ################################################################################ -def prod_maintainer (note, upload): +def prod_maintainer (notes, upload): cnf = Config() # Here we prepare an editor and get them ready to prod... (fd, temp_filename) = utils.temp_filename() temp_file = os.fdopen(fd, 'w') - if len(note) > 0: - for line in note: - temp_file.write(line) + for note in notes: + temp_file.write(note.comment) temp_file.close() editor = os.environ.get("EDITOR","vi") answer = 'E'