Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi Mittal <aditi.iitr@gmail.com>
Thu, 5 Sep 2013 17:15:10 +0000 (22:45 +0530)
committerAditi Mittal <aditi.iitr@gmail.com>
Thu, 5 Sep 2013 17:15:10 +0000 (22:45 +0530)
1  2 
mediagoblin/processing/__init__.py

index a4744e1477ac10e0ce361fadee97ccbc4ccfcd78,bdbe0441bda352970bb748d180801fd68c9be8cc..9dcdf13ce44329c205512b738ac71ad0fedbcdc2
@@@ -376,8 -376,7 +376,7 @@@ def store_public(entry, keyname, local_
          raise PublicStoreFail(keyname=keyname)
  
      # raise an error if the file failed to copy
-     copied_filepath = mgg.public_store.get_local_path(target_filepath)
-     if not os.path.exists(copied_filepath):
+     if not mgg.public_store.file_exists(target_filepath):
          raise PublicStoreFail(keyname=keyname)
  
      entry.media_files[keyname] = target_filepath
@@@ -393,7 -392,7 +392,7 @@@ class BaseProcessingFail(Exception)
      subclass from.
  
      You shouldn't call this itself; instead you should subclass it
 -    and provid the exception_path and general_message applicable to
 +    and provide the exception_path and general_message applicable to
      this error.
      """
      general_message = u''