diff options
| author |   Jason Stubbs <jstubbs@gentoo.org> | 2005-03-23 12:34:30 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-03-23 12:34:30 +0000 |
| commit | b0e668ee964b4431bc139d8da698f0a5af9d4a0a (patch) | |
| tree | 400274be387bd4fc6650f09cf3c07fb7d21e9e75 | |
| parent | Adding pre/postrm to EBUILD_PHASES (diff) | |
| download | portage-cvs-b0e668ee964b4431bc139d8da698f0a5af9d4a0a.tar.gz portage-cvs-b0e668ee964b4431bc139d8da698f0a5af9d4a0a.tar.bz2 portage-cvs-b0e668ee964b4431bc139d8da698f0a5af9d4a0a.zip | |
Removed the -a argument from all diff usage.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | bin/dispatch-conf | 8 | ||||
| -rw-r--r-- | pym/.gitignore | 2 | ||||
| -rw-r--r-- | pym/cache/.gitignore | 2 | ||||
| -rw-r--r-- | pym/sync/.gitignore | 2 | ||||
| -rw-r--r-- | pym/transports/.gitignore | 2 |
6 files changed, 16 insertions, 5 deletions
@@ -1,12 +1,15 @@ # ChangeLog for Portage; the Gentoo Linux ports system # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Id: ChangeLog,v 1.942 2005/03/22 19:29:57 genone Exp $ +# $Id: ChangeLog,v 1.943 2005/03/23 12:34:30 jstubbs Exp $ MAJOR CHANGES in 2.0.51: 1. /var/cache/edb/virtuals is no longer used at all. It's calculated now. 2. /var/cache/edb/world is now /var/lib/portage/world. 3. /etc/portage/profile/virtuals is _USER_ configs only. + 23 Mar 2005; Jason Stubbs <jstubbs@gentoo.org> bin/dispatch-conf: + Removed the -a argument from all diff usage. + 21 Mar 2005; Marius Mauch <genone@gentoo.org> pym/portage_const.py: Adding prerm and postrm to EBUILD_PHASES so logging works there too. diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 19141b9..133c50f 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -1,7 +1,7 @@ #!/usr/bin/python -O # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dispatch-conf,v 1.14 2005/02/26 04:14:19 jstubbs Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/dispatch-conf,v 1.15 2005/03/23 12:34:30 jstubbs Exp $ # # dispatch-conf -- Integrate modified configs, post-emerge @@ -20,9 +20,9 @@ sys.path = ["/usr/lib/portage/pym"]+sys.path import portage, dispatch_conf FIND_EXTANT_CONFIGS = "find %s/ -iname '._cfg????_*' | sed -e 's://:/:g'" -DIFF_CONTENTS = 'diff -Nau %s %s' -DIFF_CVS_INTERP = 'diff -Nau %s %s | grep "^[+-][^+-]" | grep -v "# .Header:.*"' -DIFF_WSCOMMENTS = 'diff -Nau %s %s | grep "^[+-][^+-]" | grep -v "^[-+]#" | grep -v "^[-+][:space:]*$"' +DIFF_CONTENTS = 'diff -Nu %s %s' +DIFF_CVS_INTERP = 'diff -Nu %s %s | grep "^[+-][^+-]" | grep -v "# .Header:.*"' +DIFF_WSCOMMENTS = 'diff -Nu %s %s | grep "^[+-][^+-]" | grep -v "^[-+]#" | grep -v "^[-+][:space:]*$"' MERGE = 'sdiff --suppress-common-lines --output=%s %s %s' # We need a secure scratch dir and python does silly verbose errors on the use of tempnam diff --git a/pym/.gitignore b/pym/.gitignore new file mode 100644 index 0000000..52e4e61 --- /dev/null +++ b/pym/.gitignore @@ -0,0 +1,2 @@ +*.pyc +*.pyo diff --git a/pym/cache/.gitignore b/pym/cache/.gitignore new file mode 100644 index 0000000..52e4e61 --- /dev/null +++ b/pym/cache/.gitignore @@ -0,0 +1,2 @@ +*.pyc +*.pyo diff --git a/pym/sync/.gitignore b/pym/sync/.gitignore new file mode 100644 index 0000000..52e4e61 --- /dev/null +++ b/pym/sync/.gitignore @@ -0,0 +1,2 @@ +*.pyc +*.pyo diff --git a/pym/transports/.gitignore b/pym/transports/.gitignore new file mode 100644 index 0000000..52e4e61 --- /dev/null +++ b/pym/transports/.gitignore @@ -0,0 +1,2 @@ +*.pyc +*.pyo |