add optional prompt argument to our_raw_input; use it.

[dak.git] / jennifer

diff --git a/jennifer b/jennifer
index 872d11d62267cf82ef4849b2bcb94e7005862425..6c1aa2c577a4c8da30e918cdda654a7bd58f5112 100755 (executable)
--- a/jennifer
+++ b/jennifer
@@ -2,7 +2,7 @@
 
 # Checks Debian packages from Incoming
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: jennifer,v 1.5 2002-02-22 01:12:15 troup Exp $
+# $Id: jennifer,v 1.7 2002-02-22 02:19:26 troup Exp $
 
 # 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
@@ -44,7 +44,7 @@ re_is_changes = re.compile (r"(.+?)_(.+?)_(.+?)\.changes$");
 ################################################################################
 
 # Globals
-jennifer_version = "$Revision: 1.5 $";
+jennifer_version = "$Revision: 1.7 $";
 
 Cnf = None;
 Options = None;
@@ -709,7 +709,7 @@ def check_files():
     if changes["architecture"].has_key("source"):
         has_source = 0;
         for file in file_keys:
-            if file[file]["type"] == "dsc":
+            if files[file]["type"] == "dsc":
                 has_source = 1;
         if not has_source:
             reject("no source found and Architecture line in changes mention source.");
@@ -942,12 +942,11 @@ def action ():
             answer = 'A';
 
     while string.find(prompt, answer) == -1:
-        print prompt,;
-        answer = utils.our_raw_input()
-        m = katie.re_default_answer.match(prompt)
+        answer = utils.our_raw_input(prompt);
+        m = katie.re_default_answer.match(prompt);
         if answer == "":
-            answer = m.group(1)
-        answer = string.upper(answer[:1])
+            answer = m.group(1);
+        answer = string.upper(answer[:1]);
 
     if answer == 'R':
         os.chdir (pkg.directory);