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 1RAA3G-0001UL-J9 for garchives@archives.gentoo.org; Sun, 02 Oct 2011 00:37:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B102621C05A; Sun, 2 Oct 2011 00:36:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 76B0821C05A for ; Sun, 2 Oct 2011 00:36:58 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 049CB1B4011 for ; Sun, 2 Oct 2011 00:36:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A22D880042 for ; Sun, 2 Oct 2011 00:36:56 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/dispatch-conf X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: fcba9794d9d377cafc60679fc800e3f5a5b506d7 Date: Sun, 2 Oct 2011 00:36:56 +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: X-Archives-Hash: c7cfaef9eae8b5e8abd162917b75da84 commit: fcba9794d9d377cafc60679fc800e3f5a5b506d7 Author: Ryan Hill gentoo org> AuthorDate: Sun Oct 2 00:34:14 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Oct 2 00:34:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dfcba9794 dispatch-conf: fix replace-wscomments pattern This will fix bug #375613. --- bin/dispatch-conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 9f245d5..3089329 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -33,7 +33,7 @@ from portage.process import find_binary FIND_EXTANT_CONFIGS =3D "find '%s' %s -name '._cfg????_%s' ! -name '.*~= ' ! -iname '.*.bak' -print" DIFF_CONTENTS =3D "diff -Nu '%s' '%s'" DIFF_CVS_INTERP =3D "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep = -v '# .Header:.*'" -DIFF_WSCOMMENTS =3D "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep = -v '^[-+]#' | grep -v '^[-+][:space:]*$'" +DIFF_WSCOMMENTS =3D "diff -Nu '%s' '%s' | grep '^[+-][^+-]' | grep = -v '^[-+]#' | grep -v '^[-+][[:space:]]*$'" =20 # We need a secure scratch dir and python does silly verbose errors on t= he use of tempnam oldmask =3D os.umask(0o077)