Merge pull request #77 from johnscancella/master

fixes #75

Author: johnscancella

bagit.py

@@ -787,14 +787,17 @@ def _make_tagmanifest_file(alg, bag_dir):
             tagmanifest.write('%s %s\n' % (digest, filename))
 
 def _find_tag_files(bag_dir):
-    for dir_name, _, filenames in os.walk(bag_dir):
-        if not re.match(r'.*data$', dir_name):
-            for filename in filenames:
-                if filename.startswith('tagmanifest-'):
-                    continue
-                #remove everything up to the bag_dir directory
-                p = join(dir_name, filename)
-                yield os.path.relpath(p, bag_dir)
+    for dir in os.listdir(bag_dir):
+        if dir != 'data':
+            if os.path.isfile(dir) and not dir.startswith('tagmanifest-'):
+                yield dir
+            for dir_name, _, filenames in os.walk(dir):
+                for filename in filenames:
+                    if filename.startswith('tagmanifest-'):
+                        continue
+                    #remove everything up to the bag_dir directory
+                    p = join(dir_name, filename)
+                    yield os.path.relpath(p, bag_dir)
 
 def _walk(data_dir):
     for dirpath, dirnames, filenames in os.walk(data_dir):