X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lisa;h=d7e73cfb7dbf817c4357a391381fd55efc387f1c;hb=6e2bf61fb7abe831e4bd434e58d271a1cb0f2750;hp=e81ea710a16878c980a728afafe3097442eea86b;hpb=c846e77a848d60dd115f00faa0d9a854161d99eb;p=dak.git

diff --git a/lisa b/lisa
index e81ea710..d7e73cfb 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.18 2002-10-16 02:47:32 troup Exp $
+# Copyright (C) 2001, 2002, 2003  James Troup <james@nocrew.org>
+# $Id: lisa,v 1.21 2003-02-11 19:39:28 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.18 $";
+lisa_version = "$Revision: 1.21 $";
 
 Cnf = None;
 Options = None;
@@ -512,13 +512,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 +571,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;
@@ -879,7 +880,7 @@ def main():
 
     # Kill me now? **FIXME**
     Cnf["Dinstall::Options::No-Mail"] = "";
-    bcc = "X-Katie: %s" % (lisa_version);
+    bcc = "X-Katie: lisa %s" % (lisa_version);
     if Cnf.has_key("Dinstall::Bcc"):
         Katie.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]);
     else: