Merge branch 'develop' of https://github.com/CenterForOpenScience/wat…

…erbutler into feature/folder-file-ops-revamp
CenterForOpenScience · Oct 18, 2017 · 8e9db9d · 8e9db9d
2 parents c09c80f + 3d9ac2f
commit 8e9db9d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,11 @@
 ChangeLog
 *********
 
+0.34.1 (2017-10-18)
+===================
+- Fix: Don't crash when a file on Google Drive is missing an md5 in its metadata.  This occurs
+for non-exportable files like Google Maps, Google Forms, etc.
+
 0.34.0 (2017-09-29)
 ===================
 - ANNOUNCEMENT!  Sadly, the WaterButler v0 API is now *undeprecated*.  We've discovered that the

diff --git a/waterbutler/__init__.py b/waterbutler/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '0.34.0'
+__version__ = '0.34.1'
 __import__('pkg_resources').declare_namespace(__name__)
diff --git a/waterbutler/providers/googledrive/metadata.py b/waterbutler/providers/googledrive/metadata.py
@@ -120,7 +120,7 @@ def extra(self):
         else:
             if not hasattr(ret, 'hashes'):
                 ret['hashes'] = {}
-            ret['hashes']['md5'] = self.raw['md5Checksum']
+            ret['hashes']['md5'] = self.raw.get('md5Checksum')  # no md5 for non-exportable file
 
         return ret