#!/usr/bin/env python
# Utility functions for katie
-# Copyright (C) 2001, 2002, 2003 James Troup <james@nocrew.org>
-# $Id: katie.py,v 1.41 2003-10-14 21:52:46 troup Exp $
+# Copyright (C) 2001, 2002, 2003, 2004 James Troup <james@nocrew.org>
+# $Id: katie.py,v 1.44 2004-02-27 20:07:40 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
def __init__(self, Cnf):
self.Cnf = Cnf;
- self.values = {};
# Read in the group-maint override file
self.nmu = nmu_p(Cnf);
self.accept_count = 0;
if files[file]["type"] == "deb":
summary += apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(file)))["Description"] + '\n';
else:
- files[file]["pool name"] = utils.poolify (changes["source"], files[file]["component"])
+ files[file]["pool name"] = utils.poolify (changes.get("source",""), files[file]["component"])
destination = self.Cnf["Dir::PoolRoot"] + files[file]["pool name"] + file
summary += file + "\n to " + destination + "\n"
return;
summary = "";
- for file in files.keys():
+ file_keys = files.keys();
+ file_keys.sort();
+ for file in file_keys:
if not files[file].has_key("new") and files[file]["type"] == "deb":
section = files[file]["section"];
override_section = files[file]["override section"];
ql = map(lambda x: x[0], q.getresult());
# Try (1)
- if ql.count(source_version):
+ if source_version in ql:
continue
# Try (2)
orig_source_version = re_bin_only_nmu_of_mu.sub('', source_version)
- if ql.count(orig_source_version):
+ if orig_source_version in ql:
continue
# Try (3)
orig_source_version = re_bin_only_nmu_of_nmu.sub('', source_version)
- if ql.count(orig_source_version):
+ if orig_source_version in ql:
continue
# No source found...