From: Ansgar Burchardt <ansgar@debian.org>
Date: Wed, 18 May 2016 15:20:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'jcristau/multivalued'
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=8303f4e3903b70213ac171c184c871d3d63d4c49;hp=7aa48c97f57c981478987184a1ea2625ab4d7011

Merge remote-tracking branch 'jcristau/multivalued'
---

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index ad47e337..2bcfbbee 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -108,19 +108,6 @@ Clean-Suites
   MorgueSubDir "pool";
 };
 
-Security-Install
-{
-  ComponentMappings
-  {
-    main "ftp-master.debian.org:/pub/UploadQueue";
-    contrib "ftp-master.debian.org:/pub/UploadQueue";
-    non-free "ftp-master.debian.org:/pub/UploadQueue";
-    non-US/main "non-us.debian.org:/pub/UploadQueue";
-    non-US/contrib "non-us.debian.org:/pub/UploadQueue";
-    non-US/non-free "non-us.debian.org:/pub/UploadQueue";
-  };
-};
-
 SuiteMappings
 {
  "silent-map stable-security stable";
@@ -181,9 +168,6 @@ ComponentMappings
  "main updates/main";
  "contrib updates/contrib";
  "non-free updates/non-free";
- "non-US/main updates/main";
- "non-US/contrib updates/contrib";
- "non-US/non-free updates/non-free";
 };
 
 Urgency
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 2986c9ea..7e3f932d 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -269,13 +269,6 @@ Common
   ThreadCount 16;
 }
 
-Changelogs
-{
-  Testing "/srv/release.debian.org/tools/trille/current-testing";
-  Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog";
-  Export "/srv/ftp-master.debian.org/export/changelogs";
-}
-
 ByGroup {
   dak-unpriv "/srv/ftp-master.debian.org/dak/config/debian/dak.conf-dak";
   ftpteam "";
diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 82ff6394..081eb247 100755
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -121,6 +121,65 @@ class ReleaseWriter(object):
     def __init__(self, suite):
         self.suite = suite
 
+    def suite_path(self):
+        """
+        Absolute path to the suite-specific files.
+        """
+        cnf = Config()
+        suite_suffix = cnf.find("Dinstall::SuiteSuffix", "")
+
+        return os.path.join(self.suite.archive.path, 'dists',
+                            self.suite.suite_name, suite_suffix)
+
+    def suite_release_path(self):
+        """
+        Absolute path where Release files are physically stored.
+        This should be a path that sorts after the dists/ directory.
+        """
+        # TODO: Eventually always create Release in `zzz-dists` to avoid
+        # special cases. However we don't want to move existing Release files
+        # for released suites.
+        # See `create_release_symlinks` below.
+        if not self.suite.byhash:
+            return self.suite_path()
+
+        cnf = Config()
+        suite_suffix = cnf.find("Dinstall::SuiteSuffix", "")
+
+        return os.path.join(self.suite.archive.path, 'zzz-dists',
+                            self.suite.suite_name, suite_suffix)
+
+    def create_release_symlinks(self):
+        """
+        Create symlinks for Release files.
+        This creates the symlinks for Release files in the `suite_path`
+        to the actual files in `suite_release_path`.
+        """
+        # TODO: Eventually always create the links.
+        # See `suite_release_path` above.
+        if not self.suite.byhash:
+            return
+
+        relpath = os.path.relpath(self.suite_release_path(), self.suite_path())
+        for f in ("Release", "Release.gpg", "InRelease"):
+            source = os.path.join(relpath, f)
+            dest = os.path.join(self.suite_path(), f)
+            if not os.path.islink(dest):
+                os.unlink(dest)
+            elif os.readlink(dest) == source:
+                continue
+            else:
+                os.unlink(dest)
+            os.symlink(source, dest)
+
+    def create_output_directories(self):
+        for path in (self.suite_path(), self.suite_release_path()):
+            try:
+                os.makedirs(path)
+            except OSError as e:
+                if e.errno != errno.EEXIST:
+                    raise
+
     def generate_release_files(self):
         """
         Generate Release files for the given suite
@@ -160,7 +219,10 @@ class ReleaseWriter(object):
 
         suite_suffix = cnf.find("Dinstall::SuiteSuffix", "")
 
-        outfile = os.path.join(suite.archive.path, 'dists', suite.suite_name, suite_suffix, "Release")
+        self.create_output_directories()
+        self.create_release_symlinks()
+
+        outfile = os.path.join(self.suite_release_path(), "Release")
         out = open(outfile + ".new", "w")
 
         for key, dbfield in attribs:
@@ -193,7 +255,7 @@ class ReleaseWriter(object):
             out.write("Description: %s\n" % suite.description)
 
         for comp in components:
-            for dirpath, dirnames, filenames in os.walk(os.path.join(suite.archive.path, "dists", suite.suite_name, suite_suffix, comp), topdown=True):
+            for dirpath, dirnames, filenames in os.walk(os.path.join(self.suite_path(), comp), topdown=True):
                 if not re_gensubrelease.match(dirpath):
                     continue
 
@@ -225,7 +287,7 @@ class ReleaseWriter(object):
         # their checksums to the main Release file
         oldcwd = os.getcwd()
 
-        os.chdir(os.path.join(suite.archive.path, "dists", suite.suite_name, suite_suffix))
+        os.chdir(self.suite_path())
 
         hashfuncs = dict(zip([x.upper().replace('UM', 'um') for x in suite.checksums],
                              [getattr(apt_pkg, "%s" % (x)) for x in [x.replace("sum", "") + "sum" for x in suite.checksums]]))