From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C99C3138010 for ; Mon, 8 Oct 2012 16:02:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 895ABE02FB; Mon, 8 Oct 2012 16:02:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 15E25E02FB for ; Mon, 8 Oct 2012 16:02:42 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7455633C1EF for ; Mon, 8 Oct 2012 16:02:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E5766E5436 for ; Mon, 8 Oct 2012 16:02:38 +0000 (UTC) From: "Paweł Hajdan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Paweł Hajdan" Message-ID: <1349712078.08d0025e085923f23e02e4f6009a651d7d7619b7.phajdan.jr@gentoo> Subject: [gentoo-commits] proj/arch-tools:new-pybugz commit in: / X-VCS-Repository: proj/arch-tools X-VCS-Files: batch-stabilize.py X-VCS-Directories: / X-VCS-Committer: phajdan.jr X-VCS-Committer-Name: Paweł Hajdan X-VCS-Revision: 08d0025e085923f23e02e4f6009a651d7d7619b7 X-VCS-Branch: new-pybugz Date: Mon, 8 Oct 2012 16:02:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cc4cc789-23c7-470b-ab8b-e05c1238bac4 X-Archives-Hash: 1a1d633a85e5b5f36821b7b99815a305 commit: 08d0025e085923f23e02e4f6009a651d7d7619b7 Author: Pawel Hajdan, Jr gentoo org> AuthorDate: Mon Oct 8 16:01:18 2012 +0000 Commit: Paweł Hajdan gentoo org> CommitDate: Mon Oct 8 16:01:18 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/arch-tools.git;a=commit;h=08d0025e More robust commit logic: - do not overwrite own changes when stabilizing multiple versions of the same package - ignore unrelated failures on other arches --- 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 = {} From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0A13A138010 for ; Mon, 8 Oct 2012 16:04:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 967B3E035C; Mon, 8 Oct 2012 16:03:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1E34EE035C for ; Mon, 8 Oct 2012 16:03:24 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3BDC33C34C for ; Mon, 8 Oct 2012 16:03:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 043B2E5450 for ; Mon, 8 Oct 2012 16:03:20 +0000 (UTC) From: "Paweł Hajdan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Paweł Hajdan" Message-ID: <1349712078.08d0025e085923f23e02e4f6009a651d7d7619b7.phajdan.jr@gentoo> Subject: [gentoo-commits] proj/arch-tools:master commit in: / X-VCS-Repository: proj/arch-tools X-VCS-Files: batch-stabilize.py X-VCS-Directories: / X-VCS-Committer: phajdan.jr X-VCS-Committer-Name: Paweł Hajdan X-VCS-Revision: 08d0025e085923f23e02e4f6009a651d7d7619b7 X-VCS-Branch: master Date: Mon, 8 Oct 2012 16:03:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 96b995bd-79b4-42cd-932f-10bc5f992a60 X-Archives-Hash: ec4268d2d0c1ee91d4665b4594e82e57 Message-ID: <20121008160320.-lmrPtvLE0hj2sNnTYZO-zlTveq-uNjxylAdgOONcQc@z> commit: 08d0025e085923f23e02e4f6009a651d7d7619b7 Author: Pawel Hajdan, Jr gentoo org> AuthorDate: Mon Oct 8 16:01:18 2012 +0000 Commit: Paweł Hajdan gentoo org> CommitDate: Mon Oct 8 16:01:18 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/arch-tools.git;a=commit;h=08d0025e More robust commit logic: - do not overwrite own changes when stabilizing multiple versions of the same package - ignore unrelated failures on other arches --- 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 = {}