← Back to branch summary

~yolanda.robla/glance/precise-security

« back to all changes in this revision

Viewing changes to glance/store/filesystem.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-09-22 10:45:33 UTC
  • mto: (50.1.2 precise-proposed)
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: package-import@ubuntu.com-20110922104533-pgmz28d1guyntg80
Tags: upstream-2011.3
Import upstream version 2011.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
glance/store/filesystem.py
126
126
    def get(self, location):
127
127
        """
128
128
        Takes a `glance.store.location.Location` object that indicates
129
 
        where to find the image file, and returns a generator for reading
130
 
        the image file
 
129
        where to find the image file, and returns a tuple of generator
 
130
        (for reading the image file) and image_size
131
131
 
132
132
        :param location `glance.store.location.Location` object, supplied
133
133
                        from glance.store.location.get_location_from_uri()
140
140
        else:
141
141
            msg = _("Found image at %s. Returning in ChunkedFile.") % filepath
142
142
            logger.debug(msg)
143
 
            return ChunkedFile(filepath)
 
143
            return (ChunkedFile(filepath), None)
144
144
 
145
145
    def delete(self, location):
146
146
        """