Merge branch 'master' of git://git.planet-lab.org/plstackapi

diff --git a/planetstack/core/models/plcorebase.py b/planetstack/core/models/plcorebase.py
index e483a79..612e925 100644 (file)
--- a/planetstack/core/models/plcorebase.py
+++ b/planetstack/core/models/plcorebase.py
@@ -7,6 +7,7 @@ from django.forms.models import model_to_dict
 from django.utils import timezone
 from django.core.exceptions import PermissionDenied
 import model_policy
+from model_autodeletion import ephemeral_models
 
 try:
     # This is a no-op if observer_disabled is set to 1 in the config file
@@ -201,6 +202,10 @@ class PlCoreBase(models.Model): # , DiffModelMixIn):
         # filtering of visible objects by user.
         return cls.objects.all()
 
+    @classmethod
+    def is_ephemeral(cls):
+       return cls in ephemeral_models
+
 
 
 

diff --git a/planetstack/dependency_walker.py b/planetstack/dependency_walker.py
index ca1959e..93e1847 100755 (executable)
--- a/planetstack/dependency_walker.py
+++ b/planetstack/dependency_walker.py
@@ -79,6 +79,7 @@ def __walk_deps(fn, object, deps):
 
                        for o in peer_objects:
                                fn(o, object)
+                               # Uncomment the following line to enable recursion
                                # walk_inv_deps(fn, o)
 
 def p(x):