Fix code to get the license location correctly.

Author: chinyeungli

about_code_tool/genabout.py

@@ -208,8 +208,8 @@ def verify_license_files(self, input_list, project_dir, license_in_project):
                     file_location = line['about_file']
                     if file_location.startswith('/'):
                         file_location = file_location.partition('/')[2]
-                    if file_location.endswith('/'):
-                        file_location = file_location.rpartition('/')[0]
+                    #if file_location.endswith('/'):
+                    #    file_location = file_location.rpartition('/')[0]
                     about_parent_dir = dirname(file_location)
                     if license_in_project:
                         license_file_path = join(project_dir, about_parent_dir, license_file)
@@ -661,8 +661,8 @@ def main(parser, options, args):
             print("The '--copy_license' <project_path> must be a directory.")
             print("'--copy_license' is skipped.")
         else:
-            if not copy_license_path.endswith('/'):
-                copy_license_path += '/'
+            #if not copy_license_path.endswith('/'):
+            #   copy_license_path += '/'
             project_parent_dir = dirname(copy_license_path)
             licenses_in_project = True
             license_list = gen.verify_license_files(input_list, project_parent_dir, licenses_in_project)
@@ -676,8 +676,8 @@ def main(parser, options, args):
             print("The '--license_text_location' <license_path> must be a directory.")
             print("'--license_text_location' is skipped.")
         else:
-            if not license_text_path.endswith('/'):
-                license_text_path += '/'
+            #if not license_text_path.endswith('/'):
+            #    license_text_path += '/'
             license_dir = dirname(license_text_path)
             licenses_in_project = False
             license_list = gen.verify_license_files(input_list, license_dir, licenses_in_project)

about_code_tool/tests/test_genabout.py

@@ -407,15 +407,15 @@ def test_verify_license_files_exist(self):
                          'license_text_file': 'apache2.LICENSE',
                           'name': 'ABOUT tool', 'about_resource': '.'}]
         path = '.'
-        expected_list = [(join('.', 'apache2.LICENSE'), '')]
+        expected_list = [(join('.', 'apache2.LICENSE'), 'TESTCASE')]
         output = gen.verify_license_files(input_list, path, False)
         self.assertEqual(expected_list, output)
         self.assertFalse(gen.warnings, "No warnings should be returned.")
         self.assertFalse(gen.errors, "No errors should be returned.")
 
     def test_verify_license_files_exist_license_in_project(self):
         gen = genabout.GenAbout()
-        input_list = [{'version': '0.8.1', 'about_file': '/TESTCASE/',
+        input_list = [{'version': '0.8.1', 'about_file': '.',
                          'license_text_file': 'apache2.LICENSE',
                           'name': 'ABOUT tool', 'about_resource': '.'}]
         path = '.'