Merge ~newell-jensen/maas:update-snapcraft-path-makefile into maas:master

[Newell Jensen]

Execute snapcraft from snap instead of the package it is installed.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b update-snapcraft-path-makefile lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: c09895300578d29be5f5f62b6924ca09ae71ca89

review: Approve

[Blake Rouse (blake-rouse)]

review: Needs Fixing

96dec20... by Newell Jensen on 2019-08-30

Error out if using the snapcraft package.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b update-snapcraft-path-makefile lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 96dec20105d0baed0d651a0ec2f31c992ee97600

review: Approve

[Blake Rouse (blake-rouse)]

Looks good, just an update on the wording.

review: Approve

6b0fbce... by Newell Jensen on 2019-08-31

Update wording of error message.

diff --git a/Makefile b/Makefile
index 227ae48..0a2908d 100644
--- a/Makefile
+++ b/Makefile
@@ -744,10 +744,15 @@ endef
 # Snap building
 #
 
-snap-clean:
+check-snapcraft:
+ifeq ($(shell which snapcraft), /usr/bin/snapcraft)
+$(error The snapcraft deb package is installed, uninstall and install snapcraft from the snap)
+endif
+
+snap-clean: check-snapcraft
 	$(snapcraft) clean
 
-snap:
+snap: check-snapcraft
 	$(snapcraft)
 
 define phony_snap_targets
@@ -764,7 +769,7 @@ endef
 build/dev-snap: ## Check out a clean version of the working tree.
 	git checkout-index -a --prefix build/dev-snap/
 
-build/dev-snap/prime: build/dev-snap
+build/dev-snap/prime: check-snapcraft build/dev-snap
 	cd build/dev-snap && $(snapcraft) prime --destructive-mode
 
 sync-dev-snap: RSYNC=rsync -v -r -u -l -t -W -L