diff options
| author |   Nicholas Jones <carpaski@gentoo.org> | 2003-04-28 10:55:04 +0000 |
|---|---|---|
| committer | Nicholas Jones <carpaski@gentoo.org> | 2003-04-28 10:55:04 +0000 |
| commit | c4c0f72c6fddc9e1105ca08b132f1edb5c329a73 (patch) | |
| tree | 6d3c83021b8d325ca3bce353d885fa4752cf5bd0 | |
| parent | Lots of cleanups and fixes. (diff) | |
| download | portage-cvs-c4c0f72c6fddc9e1105ca08b132f1edb5c329a73.tar.gz portage-cvs-c4c0f72c6fddc9e1105ca08b132f1edb5c329a73.tar.bz2 portage-cvs-c4c0f72c6fddc9e1105ca08b132f1edb5c329a73.zip | |
touchups included in _pre3portage_2_0_48_pre3b
| -rwxr-xr-x | bin/etc-update | 9 | ||||
| -rw-r--r-- | pym/portage.py | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/bin/etc-update b/bin/etc-update index 8a59d2c..f28e8e5 100755 --- a/bin/etc-update +++ b/bin/etc-update @@ -8,7 +8,7 @@ # Leo Lipelis <aeoo@gentoo.org> # Karl Trygve Kalleberg <karltk@gentoo.org> # -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/etc-update,v 1.9 2003/04/28 10:19:46 carpaski Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/etc-update,v 1.10 2003/04/28 10:55:04 carpaski Exp $ export PORTAGE_CALLER="etc-update" @@ -227,13 +227,14 @@ function do_cfg() { showdiffcmd=$(echo "${diff_command}" | sed -e "s:%file1:${ofile}:" -e "s:%file2:${file}:") - if [ "${using_editor}" == 1 ]; then - ${showdiffcmd} - else + if [ "${using_editor}" == 0 ]; then ( echo "Showing differences between ${ofile} and ${file}" ${showdiffcmd} ) | ${pager} + else + echo "Showing differences between ${ofile} and ${file}" + ${showdiffcmd} fi echo -n "1) Replace original with update 2) Delete update, keeping original as is diff --git a/pym/portage.py b/pym/portage.py index f4f29e9..5491ed0 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1,7 +1,7 @@ # portage.py -- core Portage functionality # Copyright 1998-2003 Daniel Robbins, Gentoo Technologies, Inc. # Distributed under the GNU Public License v2 -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.318 2003/04/28 10:19:46 carpaski Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.319 2003/04/28 10:55:04 carpaski Exp $ VERSION="2.0.48_pre4" @@ -112,7 +112,7 @@ def listdir(mypath,recursive=0,filesonly=0,ignorecvs=0,ignorelist=[],EmptyOnErro x=0 while x<len(ftype): if ftype[x]==1 and not (ignorecvs and (len(list[x])>=3) and (("/"+list[x][-3:])=="/CVS")): - ignored=listdir(mypath+"/"+list[x],recursive,filesonly,ignorecvs,EmptyOnError) + ignored=listdir(mypath+"/"+list[x],recursive,filesonly,ignorecvs,ignorelist,EmptyOnError) m,l,f = dircache[mypath+"/"+list[x]] l=l[:] for y in range(0,len(l)): |