Get rid of DatabaseHostname.

This also requires dropping __PRIMARY_MIRROR__ from the removal templates,
but this field already got the wrong value in case there are multiple
archives with different mirrors as only a single value was supported.

diff --git a/config/debian-security/dak.conf-etc b/config/debian-security/dak.conf-etc
index a817013b37176663d9882ea16c0081babee7cffa..d6a3194afdd57c2a46659ecab1285885c4485c0d 100644 (file)
--- a/config/debian-security/dak.conf-etc
+++ b/config/debian-security/dak.conf-etc
@@ -2,7 +2,6 @@ Config
 {
   chopin.debian.org
   {
-    DatabaseHostname    "security";
     DakConfig           "/org/security-master.debian.org/dak/config/debian-security/dak.conf";
   }
 }

diff --git a/config/debian/dak.conf-etc b/config/debian/dak.conf-etc
index 63f42126fb85e414a9d9017e7d5e74bfb330c33d..eaf35d75bbef6af9cd5f375cce38ce8f8aa0ed33 100644 (file)
--- a/config/debian/dak.conf-etc
+++ b/config/debian/dak.conf-etc
@@ -3,13 +3,11 @@ Config
   franck.debian.org
   {
     AllowLocalConfig    "false";
-    DatabaseHostname    "ftp-master";
     DakConfig           "/srv/ftp-master.debian.org/dak/config/debian/dak.conf";
   }
   coccia.debian.org
   {
     AllowLocalConfig    "false";
-    DatabaseHostname    "ftp-master";
     DakConfig           "/srv/ftp-master.debian.org/dak/config/debian/dak.conf";
   }
 }

diff --git a/config/examples/dak.conf b/config/examples/dak.conf
index e9d10c68d4b6a182182fd434b2082a2637f7eda7..b49be9542d2b7141525ccc47e33dd17611071f9f 100644 (file)
--- a/config/examples/dak.conf
+++ b/config/examples/dak.conf
@@ -5,11 +5,6 @@ Config
   // FQDN hostname
   raff.debian.org
   {
-
-    // Optional hostname as it appears in the database (if it differs
-    // from the FQDN hostname).
-    DatbaseHostname     "ftp-master";
-
     // Optional filename of dak's config file; if not present, this
     // file is assumed to contain dak config info.
     DakConfig          "/org/ftp.debian.org/dak/config/debian/dak.conf";

diff --git a/dak/rm.py b/dak/rm.py
index 688ea19b6056634ebfd1b234cea215bad5ba8261..97af8c2c6779593bc7ff3dc6f3904b71d3a1f50b 100755 (executable)
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -463,14 +463,6 @@ def main ():
         summarymail += "----------------------------------------------\n"
         Subst_close_rm["__SUMMARY__"] = summarymail
 
-        whereami = utils.where_am_i()
-        Archive = get_archive(whereami, session)
-        if Archive is None:
-            utils.warn("Cannot find archive %s.  Setting blank values for origin" % whereami)
-            Subst_close_rm["__PRIMARY_MIRROR__"] = ""
-        else:
-            Subst_close_rm["__PRIMARY_MIRROR__"] = Archive.primary_mirror
-
         for bug in utils.split_args(Options["Done"]):
             Subst_close_rm["__BUG_NUMBER__"] = bug
             if Options["Do-Close"]:

diff --git a/daklib/utils.py b/daklib/utils.py
index 655e3817f0aa2fba2bc8cb370cdcdcd1e8df745d..0febd106e6f0508bb3af2ae51827d3a94824bd34 100644 (file)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -762,14 +762,6 @@ def copy (src, dest, overwrite = 0, perms = 0o664):
 
 ################################################################################
 
-def where_am_i ():
-    res = socket.getfqdn()
-    database_hostname = Cnf.get("Config::" + res + "::DatabaseHostname")
-    if database_hostname:
-        return database_hostname
-    else:
-        return res
-
 def which_conf_file ():
     if os.getenv('DAK_CONFIG'):
         return os.getenv('DAK_CONFIG')

diff --git a/templates/rm.bug-close b/templates/rm.bug-close
index 08a3d8a77c961abd6fc00b8e6e688e42882fa61e..c53b27f8bfaaa8f8a1faf1f536c04822ab4968fe 100644 (file)
--- a/templates/rm.bug-close
+++ b/templates/rm.bug-close
@@ -17,8 +17,8 @@ database and may (or may not) still be in the pool; this is not a bug.
 The package(s) will be physically removed automatically when no suite
 references them (and in the case of source, when no binary references
 it).  Please also remember that the changes have been done on the
-master archive and will not propagate to any mirrors (__PRIMARY_MIRROR__
-included) until the next dinstall run at the earliest.
+master archive and will not propagate to any mirrors until the next
+dinstall run at the earliest.
 
 Packages are usually not removed from testing by hand. Testing tracks
 unstable and will automatically remove packages which were removed

diff --git a/templates/rm.bug-close-with-related b/templates/rm.bug-close-with-related
index fc02eaf3d3bbdf320c0807a7fb43840119222b4c..31623dbdef3cf06d88feb618cfd51f3b09c92cfb 100644 (file)
--- a/templates/rm.bug-close-with-related
+++ b/templates/rm.bug-close-with-related
@@ -17,8 +17,8 @@ database and may (or may not) still be in the pool; this is not a bug.
 The package(s) will be physically removed automatically when no suite
 references them (and in the case of source, when no binary references
 it).  Please also remember that the changes have been done on the
-master archive and will not propagate to any mirrors (__PRIMARY_MIRROR__
-included) until the next dinstall run at the earliest.
+master archive and will not propagate to any mirrors until the next
+dinstall run at the earliest.
 
 Packages are usually not removed from testing by hand. Testing tracks
 unstable and will automatically remove packages which were removed