提交 6e9b8f62 编写于 作者: J James Troup

avoid double prefixes when using katie.py check functions

上级 c9b1dfd6
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Checks Debian packages from Incoming # Checks Debian packages from Incoming
# Copyright (C) 2000, 2001 James Troup <james@nocrew.org> # Copyright (C) 2000, 2001 James Troup <james@nocrew.org>
# $Id: jennifer,v 1.3 2002-02-15 04:01:14 troup Exp $ # $Id: jennifer,v 1.4 2002-02-22 01:03:20 troup Exp $
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -44,7 +44,7 @@ re_is_changes = re.compile (r"(.+?)_(.+?)_(.+?)\.changes$"); ...@@ -44,7 +44,7 @@ re_is_changes = re.compile (r"(.+?)_(.+?)_(.+?)\.changes$");
################################################################################ ################################################################################
# Globals # Globals
jennifer_version = "$Revision: 1.3 $"; jennifer_version = "$Revision: 1.4 $";
Cnf = None; Cnf = None;
Options = None; Options = None;
...@@ -676,7 +676,7 @@ def check_files(): ...@@ -676,7 +676,7 @@ def check_files():
files[file]["new"] = 1; files[file]["new"] = 1;
if files[file]["type"] == "deb": if files[file]["type"] == "deb":
reject(Katie.check_binaries_against_db(file, suite)); reject(Katie.check_binaries_against_db(file, suite),"");
# Validate the component # Validate the component
component = files[file]["component"]; component = files[file]["component"];
...@@ -753,10 +753,10 @@ def check_dsc (): ...@@ -753,10 +753,10 @@ def check_dsc ():
reject("version ('%s') in .dsc does not match version ('%s') in .changes." % (epochless_dsc_version, changes_version)); reject("version ('%s') in .dsc does not match version ('%s') in .changes." % (epochless_dsc_version, changes_version));
# Ensure source is newer than existing source in target suites # Ensure source is newer than existing source in target suites
reject(Katie.check_source_against_db(file)); reject(Katie.check_source_against_db(file),"");
(reject_msg, is_in_incoming) = Katie.check_dsc_against_db(file); (reject_msg, is_in_incoming) = Katie.check_dsc_against_db(file);
reject(reject_msg); reject(reject_msg, "");
if is_in_incoming: if is_in_incoming:
if not Options["No-Action"]: if not Options["No-Action"]:
copy_to_holding(is_in_incoming); copy_to_holding(is_in_incoming);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册