From: James Troup Date: Mon, 22 Jan 2001 22:32:47 +0000 (+0000) Subject: sync X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=155544a1f9a5bfb0a38a5d6b448cac8aaa362865;p=dak.git sync --- diff --git a/THANKS b/THANKS index 5296b384..0baa86ed 100644 --- a/THANKS +++ b/THANKS @@ -19,5 +19,6 @@ Mark Brown Martin Michlmayr Michael Beattie Michael Mattice +Peter Gervai Robert Bihlmeyer Roland Bauerschmidt diff --git a/cron.daily-non-US b/cron.daily-non-US index 4c0a6966..5abaac26 100755 --- a/cron.daily-non-US +++ b/cron.daily-non-US @@ -33,11 +33,6 @@ pg_dump projectb > /org/non-us.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S) ################################################################################ -# temporary hack to work around the lack of an apt-utils & python-apt package -export PYTHONPATH=$PYTHONPATH:/org/non-us.debian.org/scripts/apt/build/bin/ -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/org/non-us.debian.org/scripts/apt/build/bin/ -export PATH=$PATH:/org/non-us.debian.org/scripts/apt/build/bin/ - cd $incoming rm -f REPORT katie -pak *.changes | direport | tee REPORT | \ diff --git a/katie b/katie index 103d0b8e..7a51cd87 100755 --- a/katie +++ b/katie @@ -2,7 +2,7 @@ # Installs Debian packaes # Copyright (C) 2000 James Troup -# $Id: katie,v 1.20 2001-01-21 18:12:50 troup Exp $ +# $Id: katie,v 1.21 2001-01-22 22:32:47 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 @@ -94,7 +94,7 @@ def usage (exit_code): -d, --debug=VALUE debug -k, --ack-new acknowledge new packages -m, --manual-reject=MSG manual reject with `msg' - -n, --dry-run don't do anything + -n, --no-action don't do anything -p, --no-lock don't check lockfile !! for cron.daily only !! -r, --no-version-check override version check -u, --distribution=DIST override distribution to `dist'""" @@ -207,11 +207,13 @@ def check_changes(filename): # Map frozen to unstable if frozen doesn't exist if changes["distribution"].has_key("frozen") and not Cnf.has_key("Suite::Frozen"): del changes["distribution"]["frozen"] + changes["distribution"]["unstable"] = 1; reject_message = reject_message + "Mapping frozen to unstable.\n" # Map testing to unstable if changes["distribution"].has_key("testing"): del changes["distribution"]["testing"] + changes["distribution"]["unstable"] = 1; reject_message = reject_message + "Mapping testing to unstable.\n" # Ensure target distributions exist @@ -225,6 +227,7 @@ def check_changes(filename): if not Cnf.has_key("Suite::Stable::Architectures::%s" % (i)): reject_message = reject_message + "Mapping stable to unstable for unreleased arch `%s'.\n" % (i) del changes["distribution"]["stable"] + changes["distribution"]["unstable"] = 1; # Map arches not being released from frozen to unstable if changes["distribution"].has_key("frozen"): @@ -232,6 +235,7 @@ def check_changes(filename): if not Cnf.has_key("Suite::Frozen::Architectures::%s" % (i)): reject_message = reject_message + "Mapping frozen to unstable for non-releasing arch `%s'.\n" % (i) del changes["distribution"]["frozen"] + changes["distribution"]["unstable"] = 1; # Handle uploads to stable if changes["distribution"].has_key("stable"): @@ -362,7 +366,7 @@ def check_files(): else: files[file]["byhand"] = 1; files[file]["type"] = "byhand"; - + files[file]["oldfiles"] = {} for suite in changes["distribution"].keys(): # Skip byhand @@ -415,7 +419,7 @@ def check_files(): # Check the md5sum & size against existing files (if any) location = Cnf["Dir::PoolDir"]; files[file]["location id"] = db_access.get_location_id (location, component, archive); - + files[file]["pool name"] = utils.poolify (changes["source"], files[file]["component"]); files_id = db_access.get_files_id(files[file]["pool name"] + file, files[file]["size"], files[file]["md5sum"], files[file]["location id"]); if files_id == -1: diff --git a/katie.conf-non-US b/katie.conf-non-US index 6af40418..b90ef361 100644 --- a/katie.conf-non-US +++ b/katie.conf-non-US @@ -230,6 +230,7 @@ Suite Description "Proposed Updates for Debian 2.2r3 - Not Released"; CodeName "proposed-updates"; OverrideCodeName "potato"; + OverrideSuite "stable"; Priority "2"; };