diff options
| author | Sachin Prabhu <sprabhu@redhat.com> | 2021-04-22 10:36:10 +0100 |
|---|---|---|
| committer | Sachin Prabhu <sachin.prabhu@gmail.com> | 2021-04-22 13:03:27 +0100 |
| commit | c5d986cad663073f2b460717154622122b80ff57 (patch) | |
| tree | 545523ee6105199bc8d4ee5d42ebd4b21805fa54 | |
| parent | 04faa3494e8aa594cde138e2f9b2ef3ee064f2c6 (diff) | |
| download | samba-integration-c5d986cad663073f2b460717154622122b80ff57.tar.gz samba-integration-c5d986cad663073f2b460717154622122b80ff57.tar.xz samba-integration-c5d986cad663073f2b460717154622122b80ff57.zip | |
Fix make clean
The last update to add make clean introduced errors. We cannot clean the
Vagrantfile before calling vagrant destroy.
This fixes the regressions introduced by that update.
Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
| -rw-r--r-- | vagrant/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vagrant/Makefile b/vagrant/Makefile index cfcbb6d..5644daf 100644 --- a/vagrant/Makefile +++ b/vagrant/Makefile @@ -41,12 +41,12 @@ client1.test: @$(VSSH) client1 "sudo make -C /root/samba-integration-tests test" clean_vagrant: - @$(VAGRANT) destroy -f - @rm -rf .vagrant + -$(VAGRANT) destroy -f + -rm -rf .vagrant clean_generated_files: - @rm -f Vagrantfile ansible/distro-vars.yml ansible/vagrant_ansible_inventory ansible/ssh-config-setup vagrant_ansible_inventory ssh-config-host + -rm -f Vagrantfile ansible/distro-vars.yml ansible/vagrant_ansible_inventory ansible/ssh-config-setup vagrant_ansible_inventory ssh-config-host -clean: clean_generated_files clean_vagrant +clean: clean_vagrant clean_generated_files -.PHONY: local hosts.update.only setup.prep.only setup.prep setup.test.only setup.cluster.only setup.cluster setup.clients client.test setup.site client1.test +.PHONY: local hosts.update.only setup.prep.only setup.prep setup.test.only setup.cluster.only setup.cluster setup.clients client.test setup.site client1.test clean_vagrant clean_generated_files clean |