|
@@ -245,7 +245,7 @@ def package_init_make_info():
|
|
|
pkgvar = pkgvar[:-8]
|
|
|
Package.all_licenses.append(pkgvar)
|
|
|
|
|
|
- elif pkgvar.endswith("_LICENSE_FILES") :
|
|
|
+ elif pkgvar.endswith("_LICENSE_FILES"):
|
|
|
if pkgvar.endswith("_MANIFEST_LICENSE_FILES"):
|
|
|
continue
|
|
|
pkgvar = pkgvar[:-14]
|
|
@@ -682,7 +682,6 @@ def dump_json(packages, stats, date, commit, output):
|
|
|
}
|
|
|
statistics['infra'] = {k[6:]: v for k, v in stats.items() if k.startswith('infra-')}
|
|
|
# The actual structure to dump, add commit and date to it
|
|
|
- o = subprocess.check_output(["git", "log", "master", "-n", "1", "--pretty=format:%H"])
|
|
|
final = {'packages': pkgs,
|
|
|
'stats': statistics,
|
|
|
'commit': commit,
|
|
@@ -702,9 +701,9 @@ def parse_args():
|
|
|
help='JSON output file')
|
|
|
packages = parser.add_mutually_exclusive_group()
|
|
|
packages.add_argument('-n', dest='npackages', type=int, action='store',
|
|
|
- help='Number of packages')
|
|
|
+ help='Number of packages')
|
|
|
packages.add_argument('-p', dest='packages', action='store',
|
|
|
- help='List of packages (comma separated)')
|
|
|
+ help='List of packages (comma separated)')
|
|
|
args = parser.parse_args()
|
|
|
if not args.html and not args.json:
|
|
|
parser.error('at least one of --html or --json (or both) is required')
|