Merge lp:~blake-rouse/maas/fix-1401241 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Fix missing current subdir in boot-resources path in CustomOS.

[Blake Rouse (blake-rouse)]

Self approving as the path was incorrect in the code and the tests. My bad!

review: Approve

=== modified file 'src/provisioningserver/drivers/osystem/custom.py'
--- src/provisioningserver/drivers/osystem/custom.py	2014-12-09 15:51:13 +0000
+++ src/provisioningserver/drivers/osystem/custom.py	2014-12-10 20:25:19 +0000
@@ -56,7 +56,8 @@
     def get_xinstall_parameters(self, arch, subarch, release, label):
         """Returns the xinstall image name and type for given image."""
         path = os.path.join(
-            BOOT_RESOURCES_STORAGE, 'custom', arch, subarch, release, label)
+            BOOT_RESOURCES_STORAGE, 'current', 'custom',
+            arch, subarch, release, label)
         if os.path.exists(os.path.join(path, 'root-dd')):
             return "root-dd", "dd-tgz"
         else:

=== modified file 'src/provisioningserver/drivers/osystem/tests/test_custom.py'
--- src/provisioningserver/drivers/osystem/tests/test_custom.py	2014-12-09 15:51:13 +0000
+++ src/provisioningserver/drivers/osystem/tests/test_custom.py	2014-12-10 20:25:19 +0000
@@ -35,7 +35,7 @@
         release = factory.make_name('release')
         label = factory.make_name('label')
         dirpath = os.path.join(
-            tmpdir, 'custom', arch, subarch, release, label)
+            tmpdir, 'current', 'custom', arch, subarch, release, label)
         os.makedirs(dirpath)
         factory.make_file(dirpath, filename)
         self.patch(custom, 'BOOT_RESOURCES_STORAGE', tmpdir)