From 38875d2808a5c6ee95917d56f4c5d6b992e0be24 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 10 Mar 2007 15:29:03 +0000 Subject: [PATCH] Remove more nonUS traces. --- bugcfg.pm | 10 ++-------- bugscan | 3 --- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/bugcfg.pm b/bugcfg.pm index d4f700d..233b320 100644 --- a/bugcfg.pm +++ b/bugcfg.pm @@ -4,8 +4,8 @@ use strict; use warnings; package bugcfg; -our ($spooldir,$maintainerlist,$debian_ftproot,$nonUS_ftproot,$debian_sources,$nonUS_sources,$pseudolist); -our ($nonuslist,$versionindex,$versionpkgdir); +our ($spooldir,$maintainerlist,$debian_ftproot,$debian_sources,$pseudolist); +our ($versionindex,$versionpkgdir); # General configuration stuff @@ -15,22 +15,16 @@ if ($host eq "master" or $host eq "spohr" or $host eq "rietz") { $spooldir = "/org/bugs.debian.org/debbugs/spool/db-h"; $maintainerlist = "/etc/debbugs/Maintainers"; $debian_ftproot = "/org/bugs.debian.org/etc/indices/ftp/testing"; - $nonUS_ftproot = "/org/bugs.debian.org/etc/indices/nonus/testing"; $debian_sources = "/etc/debbugs/indices/ftp.sources"; - $nonUS_sources = "/etc/debbugs/indices/nonus.sources"; $pseudolist = "/org/bugs.debian.org/etc/pseudo-packages.description"; - $nonuslist = "/debian/home/maor/masterfiles/Packages.non-US"; $versionindex = "/org/bugs.debian.org/versions/indices/versions.idx"; $versionpkgdir = "/org/bugs.debian.org/versions/pkg"; } elsif ($host eq "merkel") { $spooldir = "/org/bugs.debian.org/spool/db-h"; $maintainerlist = "/etc/debbugs/Maintainers"; $debian_ftproot = "/org/bugs.debian.org/etc/indices/ftp/testing"; - $nonUS_ftproot = "/org/bugs.debian.org/etc/indices/nonus/testing"; $debian_sources = "/etc/debbugs/indices/ftp.sources"; - $nonUS_sources = "/etc/debbugs/indices/nonus.sources"; $pseudolist = "/org/bugs.debian.org/etc/pseudo-packages.description"; - $nonuslist = "/debian/home/maor/masterfiles/Packages.non-US"; $versionindex = "/org/bugs.debian.org/versions/indices/versions.idx"; $versionpkgdir = "/org/bugs.debian.org/versions/pkg"; } else { diff --git a/bugscan b/bugscan index 7b76b6e..2bc7b4d 100755 --- a/bugscan +++ b/bugscan @@ -8,12 +8,9 @@ use strict; # Main part scanlib::readpackages($bugcfg::debian_ftproot, "debian") if defined $bugcfg::debian_ftproot; -scanlib::readpackages($bugcfg::nonUS_ftproot, "non-US") if defined $bugcfg::nonUS_ftproot; scanlib::readsources($bugcfg::debian_ftproot, "debian") if defined $bugcfg::debian_ftproot; -scanlib::readsources($bugcfg::nonUS_ftproot, "non-US") if defined $bugcfg::nonUS_ftproot; scanlib::readdebbugssources($bugcfg::debian_sources, "debian") if defined $bugcfg::debian_sources; -scanlib::readdebbugssources($bugcfg::nonUS_sources, "non-US") if defined $bugcfg::nonUS_sources; scanlib::readpseudopackages(); -- 2.39.2