sts-sponsors team mailing list archive

[Alberto Donato <mp+440305@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas:packages-no-maas-sampledata into maas:master.

Commit message:
drop maas-sampledata from deb and snap packages



Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/440305
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~ack/maas:packages-no-maas-sampledata into maas:master.

diff --git a/debian/maas-region-api.install b/debian/maas-region-api.install
index ba188b2..113d5bb 100644
--- a/debian/maas-region-api.install
+++ b/debian/maas-region-api.install
@@ -12,6 +12,5 @@ package-files/etc/maas/drivers.yaml etc/maas
 
 # Install all other stuff
 usr/bin/maas-region usr/sbin
-usr/bin/maas-sampledata usr/bin
 usr/bin/regiond usr/sbin
 debian/extras/maas_remote_syslog_compress etc/cron.d
diff --git a/debian/rules b/debian/rules
index 342d38d..c21c6a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ override_dh_auto_install:
 	dh_auto_install
 	# remove unneeded test scripts
 	rm $(CURDIR)/debian/tmp/usr/bin/test.*
+	rm $(CURDIR)/debian/tmp/usr/bin/maas-sampledata
 
 	# Collect static files
 	install -d -m 755  $(CURDIR)/debian/tmp/usr/share/maas/web/
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index a6e9919..078b060 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -176,6 +176,7 @@ parts:
       - bin
       - -bin/activate*
       - -bin/Activate*
+      - -bin/maas-sampledata
       - etc/bind
       - etc/chrony
       - etc/freeipmi