Pulled a couple bugs from master

Clark Perkins · Clark Perkins · commit ccb3dda0c0ad · 2016-05-06T11:15:14.000-05:00
diff --git a/stackdio/api/stacks/serializers.py b/stackdio/api/stacks/serializers.py
@@ -20,6 +20,7 @@
 import os
 import string
 
+import six
 import salt.cloud
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
@@ -284,8 +285,13 @@ def __call__(self):
         blueprint_id = self._context.initial_data.get('blueprint', None)
         if blueprint_id is None:
             return None
-        blueprint = Blueprint.objects.get(pk=blueprint_id)
-        return blueprint.create_users
+        if not isinstance(blueprint_id, six.integer_types):
+            return None
+        try:
+            blueprint = Blueprint.objects.get(pk=blueprint_id)
+            return blueprint.create_users
+        except Blueprint.DoesNotExist:
+            return None
 
 
 class StackSerializer(CreateOnlyFieldsMixin, StackdioHyperlinkedModelSerializer):
diff --git a/stackdio/api/stacks/tasks.py b/stackdio/api/stacks/tasks.py
@@ -1694,7 +1694,8 @@ def destroy_stack(stack_id):
                              level=Stack.ERROR)
         else:
             # delete the stack storage directory
-            shutil.rmtree(stack.get_root_directory())
+            if os.path.exists(stack.get_root_directory()):
+                shutil.rmtree(stack.get_root_directory())
             stack.delete()
 
     except Stack.DoesNotExist:
