From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S5yKi-0002jB-8C for garchives@archives.gentoo.org; Fri, 09 Mar 2012 11:50:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89152E0766; Fri, 9 Mar 2012 11:49:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5D2D9E0752 for ; Fri, 9 Mar 2012 11:49:56 +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 A8FE71B4032 for ; Fri, 9 Mar 2012 11:49:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6E4F9E5428 for ; Fri, 9 Mar 2012 11:49:53 +0000 (UTC) From: "Paweł Hajdan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Paweł Hajdan" Message-ID: <1331278296.b95113ab4b205b9de68b13ec8f30a8f6c5f1415e.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: b95113ab4b205b9de68b13ec8f30a8f6c5f1415e X-VCS-Branch: master Date: Fri, 9 Mar 2012 11:49:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8b767547-ce61-4c3e-919e-8e54c31bc08d X-Archives-Hash: 7f7b2ce1e3730cb4af1354aaa4b7d1e4 commit: b95113ab4b205b9de68b13ec8f30a8f6c5f1415e Author: Pawel Hajdan, Jr gentoo org> AuthorDate: Fri Mar 9 07:31:36 2012 +0000 Commit: Pawe=C5=82 Hajdan gentoo org> CommitDate: Fri Mar 9 07:31:36 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/arch-tools.gi= t;a=3Dcommit;h=3Db95113ab Improved handling of CVS conflicts. --- batch-stabilize.py | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/batch-stabilize.py b/batch-stabilize.py index e2c4976..db869bb 100755 --- a/batch-stabilize.py +++ b/batch-stabilize.py @@ -2,10 +2,12 @@ # Copyright 2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 +import glob import itertools import optparse import os import re +import shutil import subprocess import sys =20 @@ -23,7 +25,10 @@ def print_and_log(message, log): =20 def run_command(args, cwd, log): try: - log.write("Running %r in %s...\n" % (args, cwd)) + message =3D "Running %r in %s...\n" % (args, cwd) + sys.stdout.write(message) + log.write(message) + cmd =3D subprocess.Popen(args, cwd=3Dcwd, stdout=3Dsubprocess.PIPE, s= tderr=3Dsubprocess.STDOUT) output =3D cmd.communicate()[0] log.write("Finished with exit code %d\n" % cmd.returncode) @@ -111,13 +116,15 @@ if __name__ =3D=3D "__main__": cvs_path =3D os.path.join(options.repo, pn) print_and_log('Working in %s...' % cvs_path, log_file) =20 - # Remove existing changelog to avoid adding duplicate entries. - try: - os.remove(os.path.join(cvs_path, 'ChangeLog')) - except OSError: - pass + # Remove whole directory to prevent problems with conflicts. + if os.path.exists(cvs_path): + try: + shutil.rmtree(cvs_path) + except OSError: + print '!!! rmtree %s failed' % cvs_path + sys.exit(1) =20 - if run_command(["cvs", "up"], cvs_path, log_file)[0] !=3D 0: + if run_command(["cvs", "up", pn], options.repo, log_file)[0] !=3D 0= : print '!!! cvs up failed' sys.exit(1) if run_command(["ekeyword", options.arch, ebuild_name], cvs_path, l= og_file)[0] !=3D 0: