X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jennifer;h=6c1aa2c577a4c8da30e918cdda654a7bd58f5112;hb=58afa1216ab7e85f70adbb62c0a485304b42ae82;hp=8e55ece0d69b6e509d025def27e66d0d747f884d;hpb=6e9b8f62a83fe45787ee884ac97d888536b0d30a;p=dak.git

diff --git a/jennifer b/jennifer
index 8e55ece0..6c1aa2c5 100755
--- 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.4 2002-02-22 01:03:20 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.4 $";
+jennifer_version = "$Revision: 1.7 $";
 
 Cnf = None;
 Options = None;
@@ -705,6 +705,15 @@ def check_files():
             if files[file]["oldfiles"].has_key(suite) and files[file]["oldfiles"][suite]["name"] != files[file]["component"]:
                 files[file]["othercomponents"] = files[file]["oldfiles"][suite]["name"];
 
+    # If the .changes file says it has source, it must have source.
+    if changes["architecture"].has_key("source"):
+        has_source = 0;
+        for file in file_keys:
+            if files[file]["type"] == "dsc":
+                has_source = 1;
+        if not has_source:
+            reject("no source found and Architecture line in changes mention source.");
+
 ###############################################################################
 
 def check_dsc ():
@@ -933,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);