From: James Troup Date: Sun, 30 Dec 2007 20:33:16 +0000 (+0000) Subject: [JJ, r=JT] drop support for non-US which was last used in Debian for 3.0 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e7858bde0c543619876753639a40e031079dae41;p=dak.git [JJ, r=JT] drop support for non-US which was last used in Debian for 3.0 --- diff --git a/ChangeLog b/ChangeLog index 7d6bb401..c693e30f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,31 @@ * dak/examine_package.py (print_copyright): ignore stderr when finding copyright file. + * dak/init_db.py (do_section): Remove non-US code + + * dak/make_overrides.py (main): ditto + + * dak/process_new.py (determine_new): ditto + + * daklib/queue.py (Upload.in_override_p), + (Upload.check_override): ditto + + * daklib/utils.py (extract_component_from_section):, + (poolify): ditto + + * dak/import_archive.py (update_section): ditto + + * dak/symlink_dists.py (fix_component_section): ditto + + * scripts/debian/mkmaintainers: ditto + + * scripts/debian/update-mirrorlists (masterlist): ditto + + * config/debian-non-US/*: Remove subdir + + * scripts/debian/update-readmenonus: Removed. + + 2007-12-28 Anthony Towns * daklib/utils.py (check_signature): add NOTATION_DATA and diff --git a/config/debian-non-US/apt.conf b/config/debian-non-US/apt.conf deleted file mode 100644 index a87caa09..00000000 --- a/config/debian-non-US/apt.conf +++ /dev/null @@ -1,63 +0,0 @@ -Dir -{ - ArchiveDir "/org/non-us.debian.org/ftp/"; - OverrideDir "/org/non-us.debian.org/scripts/override/"; - CacheDir "/org/non-us.debian.org/database/"; -}; - -Default -{ - Packages::Compress ". gzip"; - Sources::Compress "gzip"; - Contents::Compress "gzip"; - DeLinkLimit 0; - MaxContentsChange 6000; - FileMode 0664; -} - -TreeDefault -{ - Contents::Header "/org/non-us.debian.org/dak/config/debian/Contents.top"; -}; - -tree "dists/proposed-updates/non-US" -{ - FileList "/org/non-us.debian.org/database/dists/proposed-updates_non-US/$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/non-us.debian.org/database/dists/proposed-updates_non-US/$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; - BinOverride "override.woody.$(SECTION)"; - SrcOverride "override.woody.$(SECTION).src"; - Contents " "; -}; - -tree "dists/testing/non-US" -{ - FileList "/org/non-us.debian.org/database/dists/testing_non-US/$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/non-us.debian.org/database/dists/testing_non-US/$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; - BinOverride "override.sarge.$(SECTION)"; - SrcOverride "override.sarge.$(SECTION).src"; -}; - -tree "dists/testing-proposed-updates/non-US" -{ - FileList "/org/non-us.debian.org/database/dists/testing-proposed-updates_non-US/$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/non-us.debian.org/database/dists/testing-proposed-updates_non-US/$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; - BinOverride "override.sarge.$(SECTION)"; - SrcOverride "override.sarge.$(SECTION).src"; - Contents " "; -}; - -tree "dists/unstable/non-US" -{ - FileList "/org/non-us.debian.org/database/dists/unstable_non-US/$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/non-us.debian.org/database/dists/unstable_non-US/$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sh sparc source"; - BinOverride "override.sid.$(SECTION)"; - SrcOverride "override.sid.$(SECTION).src"; -}; diff --git a/config/debian-non-US/apt.conf.stable b/config/debian-non-US/apt.conf.stable deleted file mode 100644 index 321d5f05..00000000 --- a/config/debian-non-US/apt.conf.stable +++ /dev/null @@ -1,30 +0,0 @@ -Dir -{ - ArchiveDir "/org/non-us.debian.org/ftp/"; - OverrideDir "/org/non-us.debian.org/scripts/override/"; - CacheDir "/org/non-us.debian.org/database/"; -}; - -Default -{ - Packages::Compress ". gzip"; - Sources::Compress "gzip"; - Contents::Compress "gzip"; - DeLinkLimit 0; - FileMode 0664; -} - -TreeDefault -{ - Contents::Header "/org/non-us.debian.org/dak/config/debian/Contents.top"; -}; - -tree "dists/stable/non-US" -{ - FileList "/org/non-us.debian.org/database/dists/stable_non-US/$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/non-us.debian.org/database/dists/stable_non-US/$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; - BinOverride "override.woody.$(SECTION)"; - SrcOverride "override.woody.$(SECTION).src"; -}; diff --git a/config/debian-non-US/cron.daily b/config/debian-non-US/cron.daily deleted file mode 100755 index f5c2d0be..00000000 --- a/config/debian-non-US/cron.daily +++ /dev/null @@ -1,116 +0,0 @@ -#! /bin/sh -# -# Executed daily via cron, out of dak's crontab. - -set -e -export SCRIPTVARS=/org/non-us.debian.org/dak/config/debian-non-US/vars -. $SCRIPTVARS - -################################################################################ - -echo Archive maintenance started at $(date +%X) - -NOTICE="$ftpdir/Archive_Maintenance_In_Progress" - -cleanup() { - rm -f "$NOTICE" -} -trap cleanup 0 - -rm -f "$NOTICE" -cat > "$NOTICE" < /org/non-us.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S) - -################################################################################ - -update-readmenonus - -################################################################################ - -if [ ! -z "$(find "$accepted" -name \*.changes -maxdepth 1 -mindepth 1)" ]; then - cd $accepted - rm -f REPORT - dak process-accepted -pa *.changes | tee REPORT | \ - mail -s "Non-US Install for $(date +%D)" ftpmaster@ftp-master.debian.org - chgrp debadmin REPORT - chmod 664 REPORT -else - echo "dak process-accepted: Nothing to install." -fi - -cd $masterdir -symlinks -d -r $ftpdir - -cd $masterdir -dak make-suite-file-list - -# Generate override files -cd $overridedir -dak make-overrides -# FIXME -rm -f override.potato.all3 -for i in main contrib non-free; do cat override.potato.$i >> override.potato.all3; done - -# Generate Packages and Sources files -cd $masterdir -apt-ftparchive generate apt.conf -# Generate Release files -dak generate-releases - -# Clean out old packages -dak clean-suites -dak clean-queues - -# Generate the Maintainers file -cd $indices -dak make-maintainers > .new-maintainers_versions -mv -f .new-maintainers_versions Maintainers_Versions -sed -e "s/~[^ ]*\([ ]\)/\1/" < Maintainers_Versions | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers -mv -f .new-maintainers Maintainers -gzip -9v .new-maintainers.gz -mv -f .new-maintainers.gz Maintainers.gz -gzip -9v .new-maintainers_versions.gz -mv -f .new-maintainers_versions.gz Maintainers_Versions.gz -rm -f Maintainers_Versions - -cd $masterdir -copyoverrides -mklslar -mkchecksums - -rm -f $NOTICE -echo Archive maintenance finished at $(date +%X) - -################################################################################ - -echo "Creating post-daily-cron-job backup of projectb database..." -pg_dump projectb > /org/non-us.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S) - -################################################################################ - -# Vacuum the database -echo "VACUUM; VACUUM ANALYZE;" | psql projectb 2>&1 | grep -v "^NOTICE: Skipping.*only table owner can VACUUM it$" - -################################################################################ - -# Send a report on NEW/BYHAND packages -dak queue-report | mail -e -s "[non-US] NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org -# and one on crufty packages -dak cruft-report | mail -e -s "Debian non-US cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org - -################################################################################ -ulimit -m 90000 -d 90000 -s 10000 -v 90000 - -run-parts --report /org/non-us.debian.org/scripts/distmnt - -echo Daily cron scripts successful. diff --git a/config/debian-non-US/cron.hourly b/config/debian-non-US/cron.hourly deleted file mode 100644 index 3c31038e..00000000 --- a/config/debian-non-US/cron.hourly +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/sh -# -# Executed hourly via cron, out of troup's crontab. - -set -e -export SCRIPTVARS=/org/non-us.debian.org/dak/config/vars -. $SCRIPTVARS - -cd $masterdir -dak import-users-from-passwd diff --git a/config/debian-non-US/cron.unchecked b/config/debian-non-US/cron.unchecked deleted file mode 100644 index abd866e2..00000000 --- a/config/debian-non-US/cron.unchecked +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -set -e -export SCRIPTVARS=/org/non-us.debian.org/dak/config/debian-non-US/vars -. $SCRIPTVARS - -cd $unchecked - -changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs) -report=$queuedir/REPORT -timestamp=$(date "+%Y-%m-%d %H:%M") - -if [ ! -z "$changes" ]; then - echo "$timestamp": "$changes" >> $report - dak process-unchecked -a $changes >> $report - echo "--" >> $report -else - echo "$timestamp": Nothing to do >> $report -fi; diff --git a/config/debian-non-US/cron.weekly b/config/debian-non-US/cron.weekly deleted file mode 100755 index 4a07f444..00000000 --- a/config/debian-non-US/cron.weekly +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# -# Run once a week via cron, out of dak's crontab. - -set -e -export SCRIPTVARS=/org/non-us.debian.org/dak/config/debian-non-US/vars -. $SCRIPTVARS - -################################################################################ - -# Purge empty directories - -if [ ! -z "$(find $ftpdir/pool/ -type d -empty)" ]; then - find $ftpdir/pool/ -type d -empty | xargs rmdir; -fi - -# Clean up apt-ftparchive's databases - -cd $masterdir -apt-ftparchive -q clean apt.conf - -################################################################################ diff --git a/config/debian-non-US/dak.conf b/config/debian-non-US/dak.conf deleted file mode 100644 index be2527e5..00000000 --- a/config/debian-non-US/dak.conf +++ /dev/null @@ -1,479 +0,0 @@ -Dinstall -{ - GPGKeyring { - "/org/keyring.debian.org/keyrings/debian-keyring.gpg"; - "/org/keyring.debian.org/keyrings/debian-keyring.pgp"; - }; - SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg"; - SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; - SigningKeyIds "1DB114E0"; - SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; - MyEmailAddress "Debian Installer "; - MyAdminAddress "ftpmaster@debian.org"; - MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject() - MyDistribution "Debian"; // Used in emails - BugServer "bugs.debian.org"; - PackagesServer "packages.debian.org"; - TrackingServer "packages.qa.debian.org"; - LockFile "/org/non-us.debian.org/dak/lock"; - Bcc "archive@ftp-master.debian.org"; - FutureTimeTravelGrace 28800; // 8 hours - PastCutoffYear "1984"; - SkipTime 300; - CloseBugs "true"; - SuiteSuffix "non-US"; - OverrideDisparityCheck "true"; - StableDislocationSupport "false"; - Reject - { - NoSourceOnly "true"; - }; -}; - -Reject-Proposed-Updates -{ - StableRejector "Martin (Joey) Schulze "; - MoreInfoURL "http://people.debian.org/~joey/3.0r5/"; -}; - -Import-Users-From-Passwd -{ - ValidGID "800"; - // Comma separated list of users who are in Postgres but not the passwd file - KnownPostgres "udmsearch,postgres,www-data,dak,auric"; -}; - -Clean-Queues -{ - Options - { - Days 14; - }; - MorgueSubDir "queue"; -}; - - -Poolize -{ - Options - { - Limit 10240; - }; -}; - -Control-Overrides -{ - Options - { - Component "non-US/main"; - Suite "unstable"; - Type "deb"; - }; - ComponentPosition "suffix"; // Whether the component is prepended or appended to the section name -}; - -Rm -{ - Options - { - Suite "unstable"; - }; - MyEmailAddress "Debian Archive Maintenance "; - LogFile "/home/troup/public_html/removals.txt"; - Bcc "removed-packages@qa.debian.org"; -}; - -Import-Archive -{ - ExportDir "/org/non-us.debian.org/dak/import-archive-files/"; -}; - -Clean-Suites -{ - // How long (in seconds) dead packages are left before being killed - StayOfExecution 129600; // 1.5 days - MorgueSubDir "pool"; -}; - -Suite -{ - - Stable - { - Components - { - non-US/main; - non-US/contrib; - non-US/non-free; - }; - Architectures - { - source; - all; - alpha; - arm; - hppa; - i386; - ia64; - m68k; - mips; - mipsel; - powerpc; - s390; - sparc; - }; - Announce "debian-changes@lists.debian.org"; - Version "3.0r5"; - Origin "Debian"; - Description "Debian 3.0r5 Released 15th April 2005"; - CodeName "woody"; - OverrideCodeName "woody"; - Priority "3"; - Untouchable "1"; - ChangeLogBase "dists/stable/non-US/"; - }; - - Proposed-Updates - { - Components - { - non-US/main; - non-US/contrib; - non-US/non-free; - }; - Architectures - { - source; - all; - alpha; - arm; - hppa; - i386; - ia64; - m68k; - mips; - mipsel; - powerpc; - s390; - sparc; - }; - Announce "debian-changes@lists.debian.org"; - CopyChanges "dists/proposed-updates/"; - CopyDotDak "/org/non-us.debian.org/queue/proposed-updates/"; - Version "3.0-updates"; - Origin "Debian"; - Description "Debian 3.0 Proposed Updates - Not Released"; - CodeName "proposed-updates"; - OverrideCodeName "woody"; - OverrideSuite "stable"; - Priority "4"; - VersionChecks - { - MustBeNewerThan - { - Stable; - }; - MustBeOlderThan - { - Unstable; - Experimental; - }; - }; - }; - - Testing - { - Components - { - non-US/main; - non-US/contrib; - non-US/non-free; - }; - Architectures - { - source; - all; - alpha; - arm; - hppa; - i386; - ia64; - m68k; - mips; - mipsel; - powerpc; - s390; - sparc; - }; - Origin "Debian"; - Description "Debian Testing distribution - Not Released"; - CodeName "sarge"; - OverrideCodeName "sarge"; - Priority "5"; - }; - - Testing-Proposed-Updates - { - Components - { - non-US/main; - non-US/contrib; - non-US/non-free; - }; - Architectures - { - source; - all; - alpha; - arm; - hppa; - i386; - ia64; - m68k; - mips; - mipsel; - powerpc; - s390; - sparc; - }; - Origin "Debian"; - Description "Debian Testing distribution updates - Not Released"; - CodeName "testing-proposed-updates"; - OverrideCodeName "sarge"; - OverrideSuite "unstable"; - Priority "6"; - VersionChecks - { - MustBeNewerThan - { - Stable; - Proposed-Updates; - Testing; - }; - MustBeOlderThan - { - Unstable; - Experimental; - }; - }; - }; - - Unstable - { - Components - { - non-US/main; - non-US/contrib; - non-US/non-free; - }; - Architectures - { - source; - all; - alpha; - arm; - hppa; - hurd-i386; - i386; - ia64; - m68k; - mips; - mipsel; - powerpc; - s390; - sh; - sparc; - }; - Announce "debian-devel-changes@lists.debian.org"; - Origin "Debian"; - Description "Debian Unstable - Not Released"; - CodeName "sid"; - OverrideCodeName "sid"; - Priority "7"; - VersionChecks - { - MustBeNewerThan - { - Stable; - Proposed-Updates; - Testing; - Testing-Proposed-Updates; - }; - }; - }; - -}; - -SuiteMappings -{ - // JT - temp measure - "map testing-security proposed-updates"; - - "map stable proposed-updates"; - "map stable-security proposed-updates"; - "map-unreleased stable unstable"; - "map-unreleased proposed-updates unstable"; - "map testing testing-proposed-updates"; - //"map testing-security testing-proposed-updates"; - "map-unreleased testing unstable"; - "map-unreleased testing-proposed-updates unstable"; -}; - -Dir -{ - Root "/org/non-us.debian.org/ftp/"; - Pool "/org/non-us.debian.org/ftp/pool/"; - PoolRoot "pool/"; - Templates "/org/non-us.debian.org/dak/templates/"; - Override "/org/non-us.debian.org/scripts/override/"; - Lists "/org/non-us.debian.org/database/dists/"; - Log "/org/non-us.debian.org/log/"; - Morgue "/org/non-us.debian.org/morgue/"; - MorgueReject "reject"; - UrgencyLog "/org/non-us.debian.org/testing/"; - Queue - { - Accepted "/org/non-us.debian.org/queue/accepted/"; - Byhand "/org/non-us.debian.org/queue/byhand/"; - Done "/org/non-us.debian.org/queue/done/"; - Holding "/org/non-us.debian.org/queue/holding/"; - New "/org/non-us.debian.org/queue/new/"; - Reject "/org/non-us.debian.org/queue/reject/"; - Unchecked "/org/non-us.debian.org/queue/unchecked/"; - }; -}; - -DB -{ - Name "projectb"; - Host ""; - Port -1; -}; - -Architectures -{ - - source "Source"; - all "Architecture Independent"; - alpha "DEC Alpha"; - hurd-i386 "Intel ia32 running the HURD"; - hppa "HP PA RISC"; - arm "ARM"; - i386 "Intel ia32"; - ia64 "Intel ia64"; - m68k "Motorola Mc680x0"; - mips "MIPS (Big Endian)"; - mipsel "MIPS (Little Endian)"; - powerpc "PowerPC"; - s390 "IBM S/390"; - sh "Hitatchi SuperH"; - sparc "Sun SPARC/UltraSPARC"; - -}; - -Archive -{ - - non-US - { - OriginServer "non-us.debian.org"; - PrimaryMirror "non-us.debian.org"; - Description "Non-US Archive for the Debian project"; - }; - -}; - -Component -{ - - non-US/main - { - Description "Main (non-US)"; - MeetsDFSG "true"; - }; - - non-US/contrib - { - Description "Contrib (non-US)"; - MeetsDFSG "true"; - }; - - non-US/non-free - { - Description "Software that fails to meet the DFSG (non-US)"; - MeetsDFSG "false"; - }; - -}; - -Section -{ - - non-US; - -}; - -Priority -{ - - required 1; - important 2; - standard 3; - optional 4; - extra 5; - source 0; // i.e. unused - -}; - -OverrideType -{ - - deb; - udeb; - dsc; - -}; - -Location -{ - /org/non-us.debian.org/ftp/dists/ - { - Archive "non-US"; - Type "legacy"; - }; - - /org/non-us.debian.org/ftp/dists/old-proposed-updates/ - { - Archive "non-US"; - Type "legacy-mixed"; - }; - - /org/non-us.debian.org/ftp/pool/ - { - Archive "non-US"; - Suites - { - OldStable; - Stable; - Proposed-Updates; - Testing; - Testing-Proposed-Updates; - Unstable; - }; - Type "pool"; - }; - -}; - -Urgency -{ - Default "low"; - Valid - { - low; - medium; - high; - emergency; - critical; - }; -}; diff --git a/config/debian-non-US/vars b/config/debian-non-US/vars deleted file mode 100644 index e0be9687..00000000 --- a/config/debian-non-US/vars +++ /dev/null @@ -1,23 +0,0 @@ -# locations used by many scripts - -nonushome=/org/non-us.debian.org -ftpdir=$nonushome/ftp -indices=$ftpdir/indices-non-US -archs="alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sh sparc" - -masterdir=$nonushome/dak/config/debian-non-US -overridedir=$nonushome/scripts/override -dbdir=$nonushome/database/ -queuedir=$nonushome/queue/ -unchecked=$queuedir/unchecked/ -accepted=$queuedir/accepted/ -incoming=$nonushome/incoming/ - -packagesfiles=packagesfiles-non-US -sourcesfiles=sourcesfiles-non-US -contentsfiles=contentsfiles-non-US - -copyoverrides="potato.contrib potato.contrib.src potato.main potato.main.src potato.non-free potato.non-free.src woody.contrib woody.contrib.src woody.main woody.main.src woody.non-free woody.non-free.src sarge.contrib sarge.contrib.src sarge.main sarge.main.src sarge.non-free sarge.non-free.src sid.contrib sid.contrib.src sid.main sid.main.src sid.non-free sid.non-free.src" - -PATH=$masterdir:$PATH -umask 022 diff --git a/config/debian/cron.buildd b/config/debian/cron.buildd old mode 100644 new mode 100755 index 6cf0c877..5e81e765 --- a/config/debian/cron.buildd +++ b/config/debian/cron.buildd @@ -27,7 +27,7 @@ if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" ]; then for a in $ARCHS; do cp /org/wanna-build/tmp/Packages.unstable.$a-old Packages gzip -cd /org/incoming.debian.org/buildd/Packages.gz >> Packages - quinn-diff -i -a /org/buildd.debian.org/web/quinn-diff/Packages-arch-specific -A $a 2>/dev/null | perl -pi -e 's#^(non-US/)?(non-free)/.*$##msg' | wanna-build -b $a/build-db --merge-partial-quinn 2> /dev/null + quinn-diff -i -a /org/buildd.debian.org/web/quinn-diff/Packages-arch-specific -A $a 2>/dev/null | perl -pi -e 's#^(non-free)/.*$##msg' | wanna-build -b $a/build-db --merge-partial-quinn 2> /dev/null wanna-build -A $a -b $a/build-db --merge-packages Packages 2>/dev/null done rm -f Sources Packages diff --git a/dak/cruft_report.py b/dak/cruft_report.py index 19333265..8571bcf4 100755 --- a/dak/cruft_report.py +++ b/dak/cruft_report.py @@ -23,7 +23,7 @@ # you might as well write some letters to God about how unfair entropy # is while you're at it.'' -- 20020802143104.GA5628@azure.humbug.org.au -## TODO: fix NBS looping for version, implement Dubious NBS, fix up output of duplicate source package stuff, improve experimental ?, add support for non-US ?, add overrides, avoid ANAIS for duplicated packages +## TODO: fix NBS looping for version, implement Dubious NBS, fix up output of duplicate source package stuff, improve experimental ?, add overrides, avoid ANAIS for duplicated packages ################################################################################ diff --git a/dak/import_archive.py b/dak/import_archive.py index 34dc61bc..7f62fa3c 100755 --- a/dak/import_archive.py +++ b/dak/import_archive.py @@ -280,7 +280,6 @@ def update_section(): prefix = "" else: prefix = "" - component = component.replace("non-US/", "") if component != 'main': suffix = '/' + component else: diff --git a/dak/init_db.py b/dak/init_db.py index 58e46ad7..89c4ed2c 100755 --- a/dak/init_db.py +++ b/dak/init_db.py @@ -180,7 +180,6 @@ def do_section(): prefix = "" else: prefix = "" - component = component.replace("non-US/", "") if component != "main": suffix = '/' + component else: diff --git a/dak/make_maintainers.py b/dak/make_maintainers.py index 077c2483..86abde2f 100755 --- a/dak/make_maintainers.py +++ b/dak/make_maintainers.py @@ -128,7 +128,7 @@ def main(): else: packages[package] = { "maintainer": maintainer, "priority": suite_priority, "version": version } - # Process any additional Maintainer files (e.g. from non-US or pseudo packages) + # Process any additional Maintainer files (e.g. from pseudo packages) for filename in extra_files: file = daklib.utils.open_file(filename) for line in file.readlines(): diff --git a/dak/make_overrides.py b/dak/make_overrides.py index 03ded178..53bf2dfa 100755 --- a/dak/make_overrides.py +++ b/dak/make_overrides.py @@ -115,7 +115,7 @@ def main (): suffix = ".debian-installer" elif otype == "dsc": suffix = ".src" - filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), suffix) + filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component, suffix) output_file = daklib.utils.open_file(filename, 'w') do_list(output_file, suite, component, otype) output_file.close() diff --git a/dak/symlink_dists.py b/dak/symlink_dists.py index a6b3d415..8eb5e3d2 100755 --- a/dak/symlink_dists.py +++ b/dak/symlink_dists.py @@ -59,7 +59,6 @@ def fix_component_section (component, section): # FIXME: ugly hacks to work around override brain damage section = re_strip_section_prefix.sub('', section) - section = section.lower().replace('non-us', '') if section == "main" or section == "contrib" or section == "non-free": section = '' if section != '': diff --git a/daklib/queue.py b/daklib/queue.py index f6bc3d4d..6e1f3893 100644 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -471,9 +471,6 @@ distribution.""" section = files[file]["section"] override_section = files[file]["override section"] if section.lower() != override_section.lower() and section != "-": - # Ignore this; it's a common mistake and not worth whining about - if section.lower() == "non-us/main" and override_section.lower() == "non-us": - continue summary += "%s: package says section is %s, override says %s.\n" % (file, section, override_section) priority = files[file]["priority"] override_priority = files[file]["override priority"] @@ -673,10 +670,6 @@ distribution.""" component_id = database.get_component_id(component) type_id = database.get_override_type_id(type) - # FIXME: nasty non-US speficic hack - if component.lower().startswith("non-us/"): - component = component[7:] - q = self.projectB.query("SELECT s.section, p.priority FROM override o, section s, priority p WHERE package = '%s' AND suite = %s AND component = %s AND type = %s AND o.section = s.id AND o.priority = p.id" % (package, suite_id, component_id, type_id)) result = q.getresult() diff --git a/daklib/utils.py b/daklib/utils.py index 2b40219c..c6eeac2f 100755 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -104,17 +104,6 @@ def extract_component_from_section(section): if section.find('/') != -1: component = section.split('/')[0] - if component.lower() == "non-us" and section.find('/') != -1: - s = component + '/' + section.split('/')[1] - if Cnf.has_key("Component::%s" % s): # Avoid e.g. non-US/libs - component = s - - if section.lower() == "non-us": - component = "non-US/main" - - # non-US prefix is case insensitive - if component.lower()[:6] == "non-us": - component = "non-US"+component[6:] # Expand default component if component == "": @@ -122,8 +111,6 @@ def extract_component_from_section(section): component = section else: component = "main" - elif component == "non-US": - component = "non-US/main" return (section, component) @@ -386,8 +373,6 @@ def send_mail (message, filename=""): def poolify (source, component): if component: component += '/' - # FIXME: this is nasty - component = component.lower().replace("non-us/", "non-US/") if source[:3] == "lib": return component + source[:4] + '/' + source + '/' else: diff --git a/scripts/debian/mkmaintainers b/scripts/debian/mkmaintainers index c914b4c7..aa80065f 100755 --- a/scripts/debian/mkmaintainers +++ b/scripts/debian/mkmaintainers @@ -7,17 +7,8 @@ set -e . $SCRIPTVARS cd $base/misc/ -nonusmaint="$base/misc/Maintainers_Versions-non-US" - - -if wget -T15 -q -O Maintainers_Versions-non-US.gz http://non-us.debian.org/indices-non-US/Maintainers_Versions.gz; then - rm -f $nonusmaint - gunzip -c ${nonusmaint}.gz > $nonusmaint - rm -f ${nonusmaint}.gz -fi - cd $indices -dak make-maintainers $nonusmaint $configdir/pseudo-packages.maintainers | sed -e "s/~[^ ]*\([ ]\)/\1/" | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers +dak make-maintainers $configdir/pseudo-packages.maintainers | sed -e "s/~[^ ]*\([ ]\)/\1/" | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers set +e cmp .new-maintainers Maintainers >/dev/null diff --git a/scripts/debian/update-mirrorlists b/scripts/debian/update-mirrorlists index b68a870c..864fbb39 100755 --- a/scripts/debian/update-mirrorlists +++ b/scripts/debian/update-mirrorlists @@ -20,10 +20,5 @@ if [ ! -f $ftpdir/README.mirrors.html -o $masterlist -nt $ftpdir/README.mirrors. rm -f $ftpdir/README.mirrors.html $ftpdir/README.mirrors.txt $prog -m $masterlist -t html > $ftpdir/README.mirrors.html $prog -m $masterlist -t text > $ftpdir/README.mirrors.txt - if [ ! -f $ftpdir/README.non-US -o $masterlist -nt $ftpdir/README.non-US ] ; then - rm -f $ftpdir/README.non-US - $prog -m $masterlist -t nonus > $ftpdir/README.non-US - install -m 664 $ftpdir/README.non-US $webdir - fi echo Updated archive version of mirrors file fi diff --git a/scripts/debian/update-readmenonus b/scripts/debian/update-readmenonus deleted file mode 100755 index b90066ad..00000000 --- a/scripts/debian/update-readmenonus +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# Fetches up to date copy of REAME.non-US for pandora -# Michael Beattie - -. vars-non-US - -cd $ftpdir - -echo Updating non-US version of README.non-US -wget -t1 -T20 -q -N http://ftp-master.debian.org/README.non-US || \ - echo "Some error occured..." -