X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lisa;h=b092dbe80a96810cdf71f9f7bba5f5e1346a9a1a;hb=0a6418a85cc5b6ad8719929ea8deacae3dd44a96;hp=6e94196a7d6e75ee8b907a307cf2f24a1e4b819e;hpb=7c513da4020ea5a092713d811f0d97175461170f;p=dak.git

diff --git a/lisa b/lisa
index 6e94196a..b092dbe8 100755
--- a/lisa
+++ b/lisa
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Handles NEW and BYHAND packages
-# Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
-# $Id: lisa,v 1.19 2002-10-21 14:11:51 troup Exp $
+# Copyright (C) 2001, 2002, 2003  James Troup <james@nocrew.org>
+# $Id: lisa,v 1.22 2003-03-05 15:57:41 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
@@ -42,7 +42,7 @@ import apt_pkg, apt_inst;
 import db_access, fernanda, katie, logging, utils;
 
 # Globals
-lisa_version = "$Revision: 1.19 $";
+lisa_version = "$Revision: 1.22 $";
 
 Cnf = None;
 Options = None;
@@ -172,6 +172,8 @@ def determine_new (changes, files):
 
     if changes["suite"].has_key("stable"):
         print "WARNING: overrides will be added for stable!";
+    if changes["suite"].has_key("oldstable"):
+        print "WARNING: overrides will be added for OLDstable!";
     for pkg in new.keys():
         if new[pkg].has_key("othercomponents"):
             print "WARNING: %s already present in %s distribution." % (pkg, new[pkg]["othercomponents"]);
@@ -512,13 +514,14 @@ def edit_overrides (new):
         got_answer = 0
         while not got_answer:
             answer = utils.our_raw_input(prompt);
-            answer = answer[:1].upper();
+            if not utils.str_isnum(answer):
+                answer = answer[:1].upper();
             if answer == "E" or answer == "D":
                 got_answer = 1;
             elif katie.re_isanum.match (answer):
                 answer = int(answer);
                 if (answer < 1) or (answer > index):
-                    print "%s is not a valid index (%s).  Please retry." % (index_range(index), answer);
+                    print "%s is not a valid index (%s).  Please retry." % (answer, index_range(index));
                 else:
                     got_answer = 1;
 
@@ -570,7 +573,7 @@ def edit_note(note):
 
 def check_pkg ():
     try:
-        less_fd = os.popen("less -", 'w', 0);
+        less_fd = os.popen("less -R -", 'w', 0);
         stdout_fd = sys.stdout;
         try:
             sys.stdout = less_fd;