launchpad-reviewers team mailing list archive

[Gavin Panella <gavin.panella@xxxxxxxxxxxxx>]

Gavin Panella has proposed merging lp:~allenap/maas/packaging.quantal.remove-squashfs into lp:~maas-maintainers/maas/packaging.quantal.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1074167 in MAAS: "maas-import-pxe-files fails to download squashfs ephemeral images."
  https://bugs.launchpad.net/maas/+bug/1074167
  Bug #1076409 in MAAS: "maas-import-pxe-files fails when run from trunk"
  https://bugs.launchpad.net/maas/+bug/1076409
  Bug #1077180 in MAAS 1.2: "Not importing Quantal boot images"
  https://bugs.launchpad.net/maas/1.2/+bug/1077180

For more details, see:
https://code.launchpad.net/~allenap/maas/packaging.quantal.remove-squashfs/+merge/134472
-- 
https://code.launchpad.net/~allenap/maas/packaging.quantal.remove-squashfs/+merge/134472
Your team MAAS Maintainers is subscribed to branch lp:~maas-maintainers/maas/packaging.quantal.

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-26 10:51:16 +0000
+++ debian/changelog	2012-11-15 14:22:24 +0000
@@ -9,6 +9,11 @@
     is no longer required as upstream no longer stores files in the filesystem.
     (LP: #1069734)
 
+  [ Gavin Panella ]
+  * debian/extras/99-maas: squashfs image download is no longer needed.
+  * debian/maas-region-controller.install: maas-import-squashfs and its
+    configuration file are no longer part of upstream.
+
  -- Julian Edwards <julian.edwards@xxxxxxxxxxxxx>  Fri, 26 Oct 2012 12:50:20 +0200
 
 maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low

=== modified file 'debian/extras/99-maas'
--- debian/extras/99-maas	2012-10-04 18:52:27 +0000
+++ debian/extras/99-maas	2012-11-15 14:22:24 +0000
@@ -1,7 +1,4 @@
 # /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
-# 
+#
 # Enable launchpad personal package archives for squid-deb-proxy
 ppa.launchpad.net
-# Enable access to MAAS server HTTP to allow squashfs download
-# during install
-maas.internal.example.com # maasurl

=== modified file 'debian/maas-region-controller.install'
--- debian/maas-region-controller.install	2012-10-26 10:51:16 +0000
+++ debian/maas-region-controller.install	2012-11-15 14:22:24 +0000
@@ -29,8 +29,6 @@
 etc/cron.d/maas-import-pxe-files
 man/maas-import-pxe-files.8 usr/share/man/man8
 debian/tmp/etc/maas/import_pxe_files
-debian/tmp/usr/sbin/maas-import-squashfs
-debian/tmp/etc/maas/import_squashfs
 debian/tmp/usr/sbin/maas-import-ephemerals
 debian/tmp/etc/maas/import_ephemerals
 debian/tmp/etc/maas/commissioning-user-data