#!/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.23 2003-03-14 19:06:02 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
import db_access, fernanda, katie, logging, utils;
# Globals
-lisa_version = "$Revision: 1.19 $";
+lisa_version = "$Revision: 1.23 $";
Cnf = None;
Options = None;
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"]);
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;
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;
summary += "Description: %s\n" % (control.Find("Description"));
Katie.Subst["__BINARY_DESCRIPTIONS__"] = summary;
bxa_mail = utils.TemplateSubst(Katie.Subst,Cnf["Dir::Templates"]+"/lisa.bxa_notification");
- utils.send_mail(bxa_mail,"");
+ utils.send_mail(bxa_mail);
################################################################################