Merge lp:~julian-edwards/launchpad/publish-copy-archives-bug-520520-getPubConfig into lp:launchpad

[Julian Edwards]

Fix getPubConfig so it handles copy archives

[Julian Edwards (julian-edwards)]

= Summary =
Fix getPubConfig so it handles copy archives

== Proposed fix ==
getPubConfig() is a function in the archivepublisher module that returns a
publisher config for the, err, publisher. The config varies depending on what
type of archive is being published. Note that this is not a canonical.config
object, it's some old Soyuz crack.

This branch adds the necessary changes to make publishing of Copy archives a
reality. It's another of the many branches I'm doing to fix bug 520520.

== Implementation details ==
It's utterly trivial. Read the diff :)

== Tests ==
bin/test -cvvt publisher-config.txt

== Demo and Q/A ==

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/archivepublisher/config.py
  lib/lp/archivepublisher/tests/publisher-config.txt

[Guilherme Salgado (salgado)]

<salgado> bigjools, I was just wondering if it'd be possible to use a newly created distribution in that test, to have it not depending on any sample data
<bigjools> salgado: that would be quite a lot of work :/
<salgado> I imagined
<bigjools> the other tests in the file all do the same thing
<salgado> bigjools, do we need to have the suffixes hard-coded there? can't we take them from a constant somewhere?
<bigjools> salgado: that's the only place they will appear - is there a benefit to doing that?
<salgado> in that case, no

review: Approve (code)

=== modified file 'lib/lp/archivepublisher/config.py'
--- lib/lp/archivepublisher/config.py	2009-10-26 18:40:04 +0000
+++ lib/lp/archivepublisher/config.py	2010-02-19 16:14:15 +0000
@@ -66,6 +66,18 @@
         pubconf.archiveroot = os.path.join(
             pubconf.distroroot, archive.distribution.name + '-debug')
         update_pub_config(pubconf)
+    elif archive.is_copy:
+        pubconf.distroroot = config.archivepublisher.root
+        pubconf.archiveroot = os.path.join(
+            pubconf.distroroot,
+            archive.distribution.name + '-' + archive.name)
+        # Multiple copy archives can exist on the same machine so the
+        # temp areas need to be unique also.
+        pubconf.temproot = pubconf.archiveroot + '-temp'
+        update_pub_config(pubconf)
+        pubconf.overrideroot = pubconf.archiveroot + '-overrides'
+        pubconf.cacheroot = pubconf.archiveroot + '-cache'
+        pubconf.miscroot = pubconf.archiveroot + '-misc'
     else:
         raise AssertionError(
             "Unknown archive purpose %s when getting publisher config.",

=== modified file 'lib/lp/archivepublisher/tests/publisher-config.txt'
--- lib/lp/archivepublisher/tests/publisher-config.txt	2009-05-15 09:51:48 +0000
+++ lib/lp/archivepublisher/tests/publisher-config.txt	2010-02-19 16:14:15 +0000
@@ -202,3 +202,32 @@
     hoary-test:
       Architectures: amd64, i386
       Components: main, multiverse, restricted, universe
+
+
+== COPY ==
+
+In the case of copy archives (used for rebuild testing) the archiveroot
+is of the form distroroot/distroname-archivename
+
+    >>> copy_archive = getUtility(IArchiveSet).new(
+    ...     purpose=ArchivePurpose.COPY, owner=ubuntutest.owner,
+    ...     distribution=ubuntutest, name="rebuildtest99")
+
+    >>> copy_config = getPubConfig(copy_archive)
+
+    >>> dump_config(copy_config)
+    stayofexecution: 5.0
+    distroroot:      /var/tmp/archive
+    archiveroot:     /var/tmp/archive/ubuntutest-rebuildtest99
+    poolroot:        /var/tmp/archive/ubuntutest-rebuildtest99/pool
+    distsroot:       /var/tmp/archive/ubuntutest-rebuildtest99/dists
+    overrideroot:    /var/tmp/archive/ubuntutest-rebuildtest99-overrides
+    cacheroot:       /var/tmp/archive/ubuntutest-rebuildtest99-cache
+    miscroot:        /var/tmp/archive/ubuntutest-rebuildtest99-misc
+    temproot:        /var/tmp/archive/ubuntutest-rebuildtest99-temp
+    breezy-autotest:
+      Architectures:
+      Components: main, multiverse, restricted, universe
+    hoary-test:
+      Architectures: amd64, i386
+      Components: main, multiverse, restricted, universe