From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 19 Jan 2007 20:45:00 +0000 (+0000)
Subject: - only check expires if slice isn't being deleted
X-Git-Tag: pycurl-7_13_1~60
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9ee0739de638548d01573cbff84a585dce9c6e05;p=plcapi.git

- only check expires if slice isn't being deleted
---

diff --git a/PLC/Slices.py b/PLC/Slices.py
index af6062d6..601ec671 100644
--- a/PLC/Slices.py
+++ b/PLC/Slices.py
@@ -85,7 +85,8 @@ class Slice(Row):
     def validate_expires(self, expires):
         # N.B.: Responsibility of the caller to ensure that expires is
         # not too far into the future.
-	return Row.validate_timestamp(self, expires, check_future = True)
+        check_future = not ('is_deleted' in self and self['is_deleted'])
+        return Row.validate_timestamp(self, expires, check_future = check_future)
 
     add_person = Row.add_object(Person, 'slice_person')
     remove_person = Row.remove_object(Person, 'slice_person')