X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fsite_avenger%2Frevamp_cakelampvm.sh;h=1d02bcb9560e5927af8b5a1d060fb2cb0f192bde;hb=b9133738e6543013d367f92c9c95bab837b4713b;hp=3cf7db3702c50671fdda90f514e624405b937b4f;hpb=06e07a2a9d8fb002e8c7707c68d480a8d743b181;p=feisty_meow.git diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh index 3cf7db37..1d02bcb9 100644 --- a/scripts/site_avenger/revamp_cakelampvm.sh +++ b/scripts/site_avenger/revamp_cakelampvm.sh @@ -132,9 +132,11 @@ test_or_die "changing dir to mapsdemo app" # gets rid of the old version of configs. git stash -test_or_die "stashing mapsdemo changes" -git stash drop -test_or_die "dropping mapsdemo stash" +if [ $? -eq 0 ]; then + # we actually stashed something, so deal with that. + git stash drop + test_or_die "dropping mapsdemo stash" +fi popd