← Back to branch summary

~rlane/nova/ldapimprovements

« back to all changes in this revision

Viewing changes to nova/objectstore/image.py

  • Committer: Ryan Lane
  • Date: 2010-11-24 15:46:32 UTC
  • mfrom: (382.48.1 trunk)
  • Revision ID: laner@controller-20101124154632-zh7kwjuyyd02a2lh
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/objectstore/image.py
48
48
        self.image_id = image_id
49
49
        self.path = os.path.abspath(os.path.join(FLAGS.images_path, image_id))
50
50
        if not self.path.startswith(os.path.abspath(FLAGS.images_path)) or \
51
 
            not os.path.isdir(self.path):
52
 
                raise exception.NotFound
 
51
        not os.path.isdir(self.path):
 
52
            raise exception.NotFound
53
53
 
54
54
    @property
55
55
    def image_path(self):