Fixed #88

Log error if any of the ABOUT files in the input does not exist in the codebase for the attribution generation.

Author: chinyeungli

about_code_tool/about.py

@@ -43,6 +43,7 @@
 import sys
 import urlparse
 import logging
+
 from collections import namedtuple
 from datetime import datetime
 from email.parser import HeaderParser
@@ -969,6 +970,8 @@ class AboutCollector(object):
     Summarize all the issues from each instance.
     """
     def __init__(self, input_path):
+        if isdir(input_path) and not input_path.endswith('/'):
+            input_path = input_path + '/'
         self.user_provided_path = input_path
         self.absolute_path = abspath(input_path)
         assert exists(self.absolute_path)
@@ -1105,10 +1108,18 @@ def generate_attribution(self, template_path='templates/default.html',
         license_key = []
         license_text = []
         license_dict = {}
-        #common_license = ['GNU General Public License 2.0','OpenSSL/SSLeay License', 'Apache License 2.0', 'BSD-Modified']
+        not_exist_components = list(limit_to)
 
         for about_object in self:
             about_relative_path = '/'+ about_object.location.partition(self.user_provided_path)[2]
+            # Check is there any components in the 'limit_to' list that
+            # does not exist in the code base.
+            if limit_to:
+                try:
+                    not_exist_components.remove(about_relative_path)
+                except Exception as e:
+                    continue
+
             if not limit_to or about_relative_path in limit_to:
                 validated_fields.append(about_object.validated_fields)
                 notice_text.append(about_object.notice_text())
@@ -1142,6 +1153,14 @@ def generate_attribution(self, template_path='templates/default.html',
                                                         about_object.about_resource,\
                                                         msg))
 
+        if not_exist_components:
+            for component in not_exist_components:
+                msg = 'about file: %s - file does not exist. '\
+                    'No attribution is generated for this component.'\
+                    % (self.user_provided_path + component).replace('//', '/')
+                self.genattrib_errors.append(Error(GENATTRIB, 'about_file',\
+                                                   component, msg))
+
         # We want the license generation in alphabetical order
         for key in sorted(license_dict.keys()):
             license_key.append(key)

about_code_tool/genattrib.py

@@ -158,6 +158,10 @@ def main(parser, options, args):
             with open(component_subset_path, "rU") as f:
                 input_dict = csv.DictReader(f)
                 for row in input_dict:
+                    # Force the path to start with the '/' to do the mapping
+                    # with the project structure
+                    if not row['about_file'].startswith('/'):
+                        row['about_file'] = '/' + row['about_file']
                     input_list.append(row)
             if mapping_config:
                 mapping_list = genabout.GenAbout().get_mapping_list()