diff options
author | 2012-10-08 18:01:18 +0200 | |
---|---|---|
committer | 2012-10-08 18:01:18 +0200 | |
commit | 08d0025e085923f23e02e4f6009a651d7d7619b7 (patch) | |
tree | 5d863f8901c9315292bbf8672faa69cfa45385dc | |
parent | Exclude mono/dotnet from stabilization candidates. (diff) | |
download | arch-tools-08d0025e085923f23e02e4f6009a651d7d7619b7.tar.gz arch-tools-08d0025e085923f23e02e4f6009a651d7d7619b7.tar.bz2 arch-tools-08d0025e085923f23e02e4f6009a651d7d7619b7.zip |
More robust commit logic:
- do not overwrite own changes when stabilizing multiple versions of the
same package
- ignore unrelated failures on other arches
-rwxr-xr-x | batch-stabilize.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/batch-stabilize.py b/batch-stabilize.py index bede303..c7b676f 100755 --- a/batch-stabilize.py +++ b/batch-stabilize.py @@ -138,6 +138,9 @@ if __name__ == "__main__": if run_command(["cvs", "up", pn], options.repo, log_file)[0] != 0: print '!!! cvs up failed' sys.exit(1) + for (pn, ebuild_name) in stabilization_dict[bug_id]: + cvs_path = os.path.join(options.repo, pn) + print_and_log('Working in %s...' % cvs_path, log_file) if run_command(["ekeyword", options.arch, ebuild_name], cvs_path, log_file)[0] != 0: print '!!! ekeyword failed' sys.exit(1) @@ -159,7 +162,7 @@ if __name__ == "__main__": if run_command(["repoman", "manifest"], cvs_path, log_file)[0] != 0: print '!!! repoman manifest failed' sys.exit(1) - if run_command(["repoman", "commit", "-m", commit_message], cvs_path, log_file)[0] != 0: + if run_command(["repoman", "commit", "--ignore-arches", "-m", commit_message], cvs_path, log_file)[0] != 0: print '!!! repoman commit failed' sys.exit(1) params = {} |