diff options
author | Olav Vitters <ovitters@mageia.org> | 2012-03-15 14:08:26 +0000 |
---|---|---|
committer | Olav Vitters <ovitters@mageia.org> | 2012-03-15 14:08:26 +0000 |
commit | 7c73cddca15fffbfeb853ca9dcaa069df1d6d6cc (patch) | |
tree | 324e23c8e7bf9706bf91015b9976f88a01c851f4 /mgagnome | |
parent | a6edc6400d6c37553a3ffbbd989577e088727477 (diff) | |
download | mgagnome-7c73cddca15fffbfeb853ca9dcaa069df1d6d6cc.tar mgagnome-7c73cddca15fffbfeb853ca9dcaa069df1d6d6cc.tar.gz mgagnome-7c73cddca15fffbfeb853ca9dcaa069df1d6d6cc.tar.bz2 mgagnome-7c73cddca15fffbfeb853ca9dcaa069df1d6d6cc.tar.xz mgagnome-7c73cddca15fffbfeb853ca9dcaa069df1d6d6cc.zip |
make cmd_patches use join_streams
Diffstat (limited to 'mgagnome')
-rwxr-xr-x | mgagnome | 39 |
1 files changed, 16 insertions, 23 deletions
@@ -522,7 +522,7 @@ def write_file(path, data): def cmd_co(options, parser): root = os.path.expanduser(PKGROOT) - for package, module, package_version, spec_version in sorted(join_streams()): + for package, module, package_version, spec_version, downstream_files in sorted(join_streams()): print "%s => %s" % (module, package) subprocess.call(['mgarepo', 'co', package], cwd=root) @@ -547,37 +547,30 @@ def join_streams(show_version=False, only_diff_version=False): if only_diff_version and package_version == spec_version: continue - yield (package, module, package_version, spec_version) + yield (package, module, package_version, spec_version, downstream_files[package]) def cmd_ls(options, parser): - for package, module, package_version, spec_version in sorted(join_streams(show_version=options.show_version, only_diff_version=options.diff)): + for package, module, package_version, spec_version, downstream_files in sorted(join_streams(show_version=options.show_version, only_diff_version=options.diff)): print package,"\t", if options.upstream: print module, "\t", if options.show_version: print spec_version, "\t", package_version, "\t", print def cmd_patches(options, parser): - upstream = get_upstream_names() - downstream, downstream_files = get_downstream_names() - - path = os.path.expanduser(PKGROOT) - - import pprint + root = os.path.expanduser(PKGROOT) - matches = upstream & set(downstream.keys()) - for module in sorted(matches): - for srpm in downstream[module].keys(): - for filename in downstream_files[srpm]: - if '.patch' in filename or '.diff' in filename: - - p = Patch(os.path.join(path, srpm, "SOURCES", filename), show_path=options.path) - valid = "" - forwarded = "" - if p.dep3['headers']: - forwarded = p.dep3['headers'].get('Forwarded', "no") - if p.dep3['valid']: - valid="VALID" - print "\t".join((module, srpm, str(p), forwarded, valid)) + for package, module, package_version, spec_version, downstream_files in sorted(join_streams()): + for filename in downstream_files: + if '.patch' in filename or '.diff' in filename: + + p = Patch(os.path.join(root, package, "SOURCES", filename), show_path=options.path) + valid = "" + forwarded = "" + if p.dep3['headers']: + forwarded = p.dep3['headers'].get('Forwarded', "no") + if p.dep3['valid']: + valid="VALID" + print "\t".join((module, package, str(p), forwarded, valid)) def cmd_dep3(options, parser): p = Patch(options.patch) |