Merge lp:~dooferlad/linaro-license-protection/bigdir into lp:~linaro-automation/linaro-license-protection/trunk

[James Tunnicliffe]

[Milo Casagrande (milo)]

Looks great!
Thanks for working on this!
+1

review: Approve

=== modified file 'HACKING'
--- HACKING	2013-03-12 14:59:02 +0000
+++ HACKING	2013-05-29 13:42:29 +0000
@@ -10,6 +10,8 @@
  * python-mock
  * python-subunit
  * testrepository (>=0.0.6)
+ * python-django-openid-auth
+ * python-textile
 
 Code structure
 --------------

=== modified file 'license_protected_downloads/buildinfo.py'
--- license_protected_downloads/buildinfo.py	2013-05-08 12:10:58 +0000
+++ license_protected_downloads/buildinfo.py	2013-05-29 13:42:29 +0000
@@ -57,11 +57,22 @@
 
     def getInfoForFile(self):
         for block in self.build_info_array:
+
+            if self.fname in block:
+                # File name matches a key directly - don't need to iterate
+                # through each using fnmatch to implement globs.
+                return block[self.fname]
+
+            if self.full_file_name == self.search_path:
+                # Searching for directory match. This will only match the "*"
+                # glob.
+                if "*" in block:
+                    return block["*"]
+                else:
+                    return [{}]
+
             for key in block:
                 if key != "format-version":
-                    # Special handling of entire-directory access specifier
-                    if key == "*" and os.path.isdir(self.full_file_name):
-                        return block[key]
                     if fnmatch.fnmatch(self.full_file_name,
                                        os.path.join(self.search_path, key)):
                         return block[key]