diff options
| author | Marius Mauch <genone@gentoo.org> | 2006-06-10 21:40:40 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2006-06-10 21:40:40 +0000 |
| commit | 4688f15f215f2d09a52238f059eca56761aaa014 (patch) | |
| tree | 2f639025198b677df11f02371672727aab1f39cf | |
| parent | 3c411aa4159cd7c2c25b0f74be5951b6e69f2a80 (diff) | |
| download | portage-4688f15f215f2d09a52238f059eca56761aaa014.tar.gz portage-4688f15f215f2d09a52238f059eca56761aaa014.tar.bz2 portage-4688f15f215f2d09a52238f059eca56761aaa014.zip | |
make elog mail module always set the 'From' header for rfc2822 compliance
svn path=/main/trunk/; revision=3483
109 files changed, 110 insertions, 109 deletions
diff --git a/bin/archive-conf b/bin/archive-conf index e4efeff65..24f0b626d 100755 --- a/bin/archive-conf +++ b/bin/archive-conf @@ -1,7 +1,7 @@ #!/usr/bin/python # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/archive-conf,v 1.7 2004/10/04 13:57:36 vapier Exp $ +# $Id$ # # archive-conf -- save off a config file in the dispatch-conf archive dir diff --git a/bin/chkcontents b/bin/chkcontents index 9b67e8dfc..bff77d0da 100755 --- a/bin/chkcontents +++ b/bin/chkcontents @@ -1,7 +1,7 @@ #!/usr/bin/python # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/chkcontents,v 1.11 2004/10/04 13:56:50 vapier Exp $ +# $Id$ # Very simple program to compare the md5sums of a package as listed # in VDB_PATH/category/package/CONTENTS with the md5sums of the diff --git a/bin/clean_locks b/bin/clean_locks index 2a3f06d22..0ecb62424 100755 --- a/bin/clean_locks +++ b/bin/clean_locks @@ -1,7 +1,7 @@ #!/usr/bin/python -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/clean_locks,v 1.1 2004/09/26 10:44:31 carpaski Exp $ +# $Id$ import os,sys,errno sys.path = ["/usr/lib/portage/pym"]+sys.path diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 586b98759..cd340a4f7 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -1,7 +1,7 @@ #!/usr/bin/python -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/dispatch-conf,v 1.7.2.10 2005/05/12 15:20:22 jstubbs Exp $ +# $Id$ # # dispatch-conf -- Integrate modified configs, post-emerge @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/dobin,v 1.13 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ $# -lt 1 ]] ; then echo "$0: at least one argument needed" 1>&2 diff --git a/bin/doconfd b/bin/doconfd index e9ea1fdfb..9952ec0f6 100755 --- a/bin/doconfd +++ b/bin/doconfd @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/doconfd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $ +# $Id$ if [[ $# -lt 1 ]] ; then echo "$0: at least one argument needed" 1>&2 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/dodir,v 1.5 2004/10/04 13:56:50 vapier Exp $ +# $Id$ slash=/ exec install -d ${DIROPTIONS} "${@/#${slash}/${D}${slash}}" diff --git a/bin/doenvd b/bin/doenvd index 5232ed908..eb7dcd720 100755 --- a/bin/doenvd +++ b/bin/doenvd @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/doenvd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $ +# $Id$ if [[ $# -lt 1 ]] ; then echo "$0: at least one argument needed" 1>&2 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/doexe,v 1.10.2.1 2004/12/06 03:01:43 carpaski Exp $ +# $Id$ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh diff --git a/bin/dohard b/bin/dohard index 03b5e67aa..ce07f11c3 100755 --- a/bin/dohard +++ b/bin/dohard @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/dohard,v 1.6 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ $# -ne 2 ]] ; then echo "$0: two arguments needed" 1>&2 diff --git a/bin/dohtml b/bin/dohtml index ac31e8091..56347a4a7 100755 --- a/bin/dohtml +++ b/bin/dohtml @@ -1,7 +1,7 @@ #!/usr/bin/python # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/dohtml,v 1.14.2.1 2004/10/27 14:39:29 jstubbs Exp $ +# $Id$ # # Typical usage: diff --git a/bin/doinfo b/bin/doinfo index 67b163b1a..82db070b8 100755 --- a/bin/doinfo +++ b/bin/doinfo @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/doinfo,v 1.7 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [ ${#} -lt 1 ] ; then echo "doinfo: at least one argument needed" diff --git a/bin/doinitd b/bin/doinitd index 8aae1b383..e8d9f69fa 100755 --- a/bin/doinitd +++ b/bin/doinitd @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/doinitd,v 1.2.2.1 2005/01/13 04:51:56 vapier Exp $ +# $Id$ if [[ $# -lt 1 ]] ; then echo "$0: at least one argument needed" 1>&2 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/doins,v 1.7.2.2 2004/12/17 22:25:13 carpaski Exp $ +# $Id$ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/dojar,v 1.8 2004/10/04 13:56:50 vapier Exp $ +# $Id$ # Author Karl Trygve Kalleberg <karltk@gentoo.org> # @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/dolib,v 1.8.2.2 2005/01/12 02:07:15 carpaski Exp $ +# $Id$ # Setup ABI cruft LIBDIR_VAR="LIBDIR_${ABI}" diff --git a/bin/dolib.a b/bin/dolib.a index c4df4a46c..3ef57d2fb 100755 --- a/bin/dolib.a +++ b/bin/dolib.a @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/dolib.a,v 1.8 2004/10/10 10:07:20 carpaski Exp $ +# $Id$ exec env LIBOPTIONS="-m0644" \ dolib "$@" diff --git a/bin/dolib.so b/bin/dolib.so index efd8c1691..e4d477f60 100755 --- a/bin/dolib.so +++ b/bin/dolib.so @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/dolib.so,v 1.12 2004/10/10 10:07:20 carpaski Exp $ +# $Id$ exec env LIBOPTIONS="-m0755" \ dolib "$@" @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/doman,v 1.13.2.2 2005/07/29 05:55:34 vapier Exp $ +# $Id$ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/domo,v 1.6 2004/10/04 13:56:50 vapier Exp $ +# $Id$ mynum=${#} if [ ${mynum} -lt 1 ] ; then diff --git a/bin/dosbin b/bin/dosbin index 30aa7893c..c9e85c0b8 100755 --- a/bin/dosbin +++ b/bin/dosbin @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/dosbin,v 1.11 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ $# -lt 1 ]] ; then echo "$0: at least one argument needed" 1>&2 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/dosed,v 1.7 2004/10/04 13:56:50 vapier Exp $ +# $Id$ mysed="s:${D}::g" @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/dosym,v 1.7 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ $# -ne 2 ]] ; then echo "$0: two arguments needed" 1>&2 diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 49cea8de8..e2d8987e2 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.201.2.42 2005/08/20 17:24:30 jstubbs Exp $ +# $Id$ PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}" PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}" @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/emake,v 1.9.2.1 2005/05/18 15:19:52 jstubbs Exp $ +# $Id$ # # emake: Supplies some default parameters to GNU make. At the moment the # only parameter supplied is -jN, where N is a number of diff --git a/bin/emerge b/bin/emerge index 80eb2bb21..a1edad024 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1,7 +1,7 @@ #!/usr/bin/python -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.38 2005/08/13 17:25:26 ferringb Exp $ +# $Id$ import os,sys os.environ["PORTAGE_CALLER"]="emerge" diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 44e0dba8f..5305c4d14 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/Attic/emerge-webrsync,v 1.8.2.4 2005/02/26 11:22:38 carpaski Exp $ +# $Id$ # Author: Karl Trygve Kalleberg <karltk@gentoo.org> # Rewritten from the old, Perl-based emerge-webrsync script diff --git a/bin/env-update b/bin/env-update index 0ee2fc3ad..d7e9f3967 100755 --- a/bin/env-update +++ b/bin/env-update @@ -1,7 +1,7 @@ #!/usr/bin/python -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/env-update,v 1.9 2004/10/04 13:56:50 vapier Exp $ +# $Id$ import os,sys os.environ["PORTAGE_CALLER"] = "env-update" diff --git a/bin/env-update.sh b/bin/env-update.sh index 58e3f406a..fcf083f82 100755 --- a/bin/env-update.sh +++ b/bin/env-update.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/env-update.sh,v 1.2 2004/10/04 13:56:50 vapier Exp $ +# $Id$ ############################################ ############################################ diff --git a/bin/etc-update b/bin/etc-update index b77c2a044..aa919ee72 100755 --- a/bin/etc-update +++ b/bin/etc-update @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: etc-update 2221 2005-11-01 01:32:07Z vapier $ +# $Id$ # Author Brandon Low <lostlogic@gentoo.org> # diff --git a/bin/find-requires b/bin/find-requires index 82959b748..80340c1ce 100755 --- a/bin/find-requires +++ b/bin/find-requires @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/find-requires,v 1.5 2004/10/04 13:56:50 vapier Exp $ +# $Id$ # note this works for both a.out and ELF executables # it also auto-generates requirment lines for shell scripts diff --git a/bin/fix-db.py b/bin/fix-db.py index 5fb479fc1..16a151502 100755 --- a/bin/fix-db.py +++ b/bin/fix-db.py @@ -1,7 +1,7 @@ #!/usr/bin/python # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/fix-db.py,v 1.8 2004/10/11 04:01:00 jstubbs Exp $ +# $Id$ import os,sys,re sys.path = ["/usr/lib/portage/pym"]+sys.path diff --git a/bin/fixdbentries b/bin/fixdbentries index af3306460..d15ffb62d 100755 --- a/bin/fixdbentries +++ b/bin/fixdbentries @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/fixdbentries,v 1.3 2004/10/04 13:56:50 vapier Exp $ +# $Id$ # Script to adjust the contents of the DB entries after a package move. # Fairly straight forward... ./movedbentry 'from/here' 'to/here' /over/here diff --git a/bin/fixpackages b/bin/fixpackages index 11cc49477..5eddb1c34 100755 --- a/bin/fixpackages +++ b/bin/fixpackages @@ -1,7 +1,7 @@ #!/usr/bin/python # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/fixpackages,v 1.6 2004/10/04 13:56:50 vapier Exp $ +# $Id$ import os,sys os.environ["PORTAGE_CALLER"]="fixpackages" diff --git a/bin/fowners b/bin/fowners index a720a5957..d13cb0300 100755 --- a/bin/fowners +++ b/bin/fowners @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: fowners 1912 2005-08-25 03:54:42Z ferringb $ +# $Id$ slash=/ exec chown "${@/#${slash}/${D}${slash}}" diff --git a/bin/fperms b/bin/fperms index 208ad351d..53a2b0fd2 100755 --- a/bin/fperms +++ b/bin/fperms @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: fperms 1912 2005-08-25 03:54:42Z ferringb $ +# $Id$ slash=/ exec chmod "${@/#${slash}/${D}${slash}}" diff --git a/bin/md5check.py b/bin/md5check.py index 9ec6c821b..65dd169e6 100755 --- a/bin/md5check.py +++ b/bin/md5check.py @@ -1,7 +1,7 @@ #!/usr/bin/python -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/md5check.py,v 1.4 2004/10/10 10:07:20 carpaski Exp $ +# $Id$ import os,sys,string os.environ["PORTAGE_CALLER"]="mirror" diff --git a/bin/md5check.sh b/bin/md5check.sh index 2be4be119..fc5122a90 100755 --- a/bin/md5check.sh +++ b/bin/md5check.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/md5check.sh,v 1.2 2004/10/04 13:56:50 vapier Exp $ +# $Id$ # pipe in the data. diff --git a/bin/newbin b/bin/newbin index 699b9a687..8e2185b29 100755 --- a/bin/newbin +++ b/bin/newbin @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/newbin,v 1.7 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ -z ${T} ]] || [[ -z ${2} ]] ; then echo "$0: Need two arguments, old file and new file" 1>&2 diff --git a/bin/newconfd b/bin/newconfd index 63a38bb78..4b1e8e7b3 100755 --- a/bin/newconfd +++ b/bin/newconfd @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/newconfd,v 1.2 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ -z ${T} ]] || [[ -z ${2} ]] ; then echo "$0: Need two arguments, old file and new file" 1>&2 diff --git a/bin/newdoc b/bin/newdoc index d3b83565b..757c8214e 100755 --- a/bin/newdoc +++ b/bin/newdoc @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/newdoc,v 1.7 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ -z ${T} ]] || [[ -z ${2} ]] ; then echo "$0: Need two arguments, old file and new file" 1>&2 diff --git a/bin/newenvd b/bin/newenvd index 07bbec644..464084719 100755 --- a/bin/newenvd +++ b/bin/newenvd @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/newenvd,v 1.2 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ -z ${T} ]] || [[ -z ${2} ]] ; then echo "$0: Need two arguments, old file and new file" 1>&2 diff --git a/bin/newexe b/bin/newexe index ce3a08231..7712644d7 100755 --- a/bin/newexe +++ b/bin/newexe @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/newexe,v 1.7 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ -z ${T} ]] || [[ -z ${2} ]] ; then echo "$0: Need two arguments, old file and new file" 1>&2 diff --git a/bin/newinitd b/bin/newinitd index 50a4d54d7..6873771c3 100755 --- a/bin/newinitd +++ b/bin/newinitd @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/newinitd,v 1.2 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ -z ${T} ]] || [[ -z ${2} ]] ; then echo "$0: Need two arguments, old file and new file" 1>&2 diff --git a/bin/newins b/bin/newins index 8dcbd99c1..c64e06600 100755 --- a/bin/newins +++ b/bin/newins @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/newins,v 1.7 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ -z ${T} ]] || [[ -z ${2} ]] ; then echo "$0: Need two arguments, old file and new file" 1>&2 diff --git a/bin/newlib.a b/bin/newlib.a index 0f9b45d9b..008aca966 100755 --- a/bin/newlib.a +++ b/bin/newlib.a @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.a,v 1.7 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ -z ${T} ]] || [[ -z ${2} ]] ; then echo "$0: Need two arguments, old file and new file" 1>&2 diff --git a/bin/newlib.so b/bin/newlib.so index a756068ef..5ea2e33b4 100755 --- a/bin/newlib.so +++ b/bin/newlib.so @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.so,v 1.7 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ -z ${T} ]] || [[ -z ${2} ]] ; then echo "$0: Need two arguments, old file and new file" 1>&2 diff --git a/bin/newman b/bin/newman index 24a4757ec..4ae4fdb7c 100755 --- a/bin/newman +++ b/bin/newman @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/newman,v 1.7 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ -z ${T} ]] || [[ -z ${2} ]] ; then echo "$0: Need two arguments, old file and new file" 1>&2 diff --git a/bin/newsbin b/bin/newsbin index ec043dbca..8adeee409 100755 --- a/bin/newsbin +++ b/bin/newsbin @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/newsbin,v 1.7 2004/10/04 13:56:50 vapier Exp $ +# $Id$ if [[ -z ${T} ]] || [[ -z ${2} ]] ; then echo "$0: Need two arguments, old file and new file" 1>&2 diff --git a/bin/pkgmerge b/bin/pkgmerge index 2782ba09e..9983ec37e 100755 --- a/bin/pkgmerge +++ b/bin/pkgmerge @@ -1,7 +1,7 @@ #!/usr/bin/python # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/pkgmerge,v 1.8 2004/10/04 13:56:50 vapier Exp $ +# $Id$ import sys,os,string sys.path = ["/usr/lib/portage/pym"]+sys.path diff --git a/bin/pkgmerge.new b/bin/pkgmerge.new index 8795fc6cf..80c70ab10 100755 --- a/bin/pkgmerge.new +++ b/bin/pkgmerge.new @@ -1,7 +1,7 @@ #!/usr/bin/python # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/pkgmerge.new,v 1.7 2004/10/04 13:56:50 vapier Exp $ +# $Id$ import os,string,sys sys.path = ["/usr/lib/portage/pym"]+sys.path diff --git a/bin/pkgname b/bin/pkgname index f33757597..d1ba2f3dd 100755 --- a/bin/pkgname +++ b/bin/pkgname @@ -1,7 +1,7 @@ #!/usr/bin/python # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/pkgname,v 1.8 2004/10/04 13:56:50 vapier Exp $ +# $Id$ import sys sys.path = ["/usr/lib/portage/pym"]+sys.path diff --git a/bin/portage_gpg_update.sh b/bin/portage_gpg_update.sh index aac518dec..92317f618 100755 --- a/bin/portage_gpg_update.sh +++ b/bin/portage_gpg_update.sh @@ -1,6 +1,6 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/portage_gpg_update.sh,v 1.2 2004/10/04 13:56:50 vapier Exp $ +# $Id$ wget -O - http://www.gentoo.org/proj/en/devrel/roll-call/userinfo.xml | sed 's:.*\(0x[0-9a-fA-F]\+\)[^0-9a-fA-F].*:\1:gp;d' | xargs gpg -vvv --no-default-keyring --no-permission-warning --homedir /usr/portage/metadata --keyring "gentoo.gpg" --keyserver subkeys.pgp.net --recv-keys &> gpg.log diff --git a/bin/portageq b/bin/portageq index ab1a9311f..b8e12c5fa 100755 --- a/bin/portageq +++ b/bin/portageq @@ -1,7 +1,7 @@ #!/usr/bin/python -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/portageq,v 1.13.2.1 2005/04/12 12:23:41 jstubbs Exp $ +# $Id$ import sys, os os.environ["PORTAGE_CALLER"] = "portageq" diff --git a/bin/prepall b/bin/prepall index 4772574a7..118b85d8b 100755 --- a/bin/prepall +++ b/bin/prepall @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: prepall 2230 2005-11-01 01:35:59Z vapier $ +# $Id$ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh diff --git a/bin/prepalldocs b/bin/prepalldocs index d8b8b7473..8d585d236 100755 --- a/bin/prepalldocs +++ b/bin/prepalldocs @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/prepalldocs,v 1.6 2004/10/04 13:56:50 vapier Exp $ +# $Id$ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh diff --git a/bin/prepallinfo b/bin/prepallinfo index 205316ab1..f0ed4f337 100755 --- a/bin/prepallinfo +++ b/bin/prepallinfo @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/prepallinfo,v 1.6 2004/10/04 13:56:50 vapier Exp $ +# $Id$ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh diff --git a/bin/prepallman b/bin/prepallman index 85a7277d3..e89ad7af0 100755 --- a/bin/prepallman +++ b/bin/prepallman @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/prepallman,v 1.10 2004/10/04 13:56:50 vapier Exp $ +# $Id$ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh diff --git a/bin/prepallstrip b/bin/prepallstrip index 3a00a2acd..178ded797 100755 --- a/bin/prepallstrip +++ b/bin/prepallstrip @@ -1,6 +1,6 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/prepallstrip,v 1.12 2004/10/04 13:56:50 vapier Exp $ +# $Id$ exec prepstrip "${D}" diff --git a/bin/prepinfo b/bin/prepinfo index dac4b6acc..d624561c7 100755 --- a/bin/prepinfo +++ b/bin/prepinfo @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/prepinfo,v 1.6.2.1 2005/05/29 12:40:08 jstubbs Exp $ +# $Id$ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh diff --git a/bin/preplib b/bin/preplib index ab784d2c5..c7f45079d 100755 --- a/bin/preplib +++ b/bin/preplib @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/preplib,v 1.7.2.1 2005/01/02 09:36:02 jstubbs Exp $ +# $Id$ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh diff --git a/bin/prepman b/bin/prepman index 9e5e41984..2968bb181 100755 --- a/bin/prepman +++ b/bin/prepman @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/prepman,v 1.10.2.3 2005/05/29 12:40:08 jstubbs Exp $ +# $Id$ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh diff --git a/bin/prepstrip b/bin/prepstrip index 6a3088957..5260539a9 100755 --- a/bin/prepstrip +++ b/bin/prepstrip @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/prepstrip,v 1.23.2.3 2005/08/15 02:58:20 vapier Exp $ +# $Id$ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh diff --git a/bin/quickpkg b/bin/quickpkg index 61b09a609..1231da9ff 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/quickpkg,v 1.13.2.6 2005/08/10 22:08:48 vapier Exp $ +# $Id$ # This script tries to quickly create a Gentoo binary package using the # VDB_PATH/category/pkg/* files diff --git a/bin/regenworld b/bin/regenworld index 221412dd5..b99370962 100755 --- a/bin/regenworld +++ b/bin/regenworld @@ -1,7 +1,7 @@ #!/usr/bin/python # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/regenworld,v 1.10.2.1 2005/01/11 03:40:57 carpaski Exp $ +# $Id$ import sys sys.path.insert(0, "/usr/lib/portage/pym") diff --git a/bin/repoman b/bin/repoman index 1204bb54f..b6808d1f9 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1,7 +1,7 @@ #!/usr/bin/python -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/repoman,v 1.98.2.23 2005/06/18 01:00:43 vapier Exp $ +# $Id$ # Next to do: dep syntax checking in mask files # Then, check to make sure deps are satisfiable (to avoid "can't find match for" problems) @@ -1,7 +1,7 @@ #!/usr/bin/python -O # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/bin/xpak,v 1.10 2004/10/04 13:56:50 vapier Exp $ +# $Id$ import sys if len(sys.argv)!=3: diff --git a/cnf/etc-update.conf b/cnf/etc-update.conf index 647af1270..0e0bf3f31 100644 --- a/cnf/etc-update.conf +++ b/cnf/etc-update.conf @@ -1,5 +1,5 @@ # edit the lines below to your liking -# $Id: /var/cvsroot/gentoo-src/portage/cnf/etc-update.conf,v 1.5.2.1 2004/10/22 16:53:30 carpaski Exp $ +# $Id$ # mode - 0 for text, 1 for menu (support incomplete) # note that you need dev-util/dialog installed diff --git a/cnf/make.conf b/cnf/make.conf index af6dac882..2180cd955 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.84.2.5 2005/04/13 15:28:38 jstubbs Exp $ +# $Id$ # Contains local system settings for Portage system # Please review 'man make.conf' for more information. diff --git a/cnf/make.globals b/cnf/make.globals index 72f717129..78268b004 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/cnf/make.globals,v 1.56.2.5 2005/05/05 03:59:59 jstubbs Exp $ +# $Id$ # System-wide defaults for the Portage system # ***************************** diff --git a/pym/cache/__init__.py b/pym/cache/__init__.py index 189885cb0..cb1b59d69 100644 --- a/pym/cache/__init__.py +++ b/pym/cache/__init__.py @@ -1,5 +1,5 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: __init__.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ diff --git a/pym/cache/anydbm.py b/pym/cache/anydbm.py index 09a1cf8b1..e250980b9 100644 --- a/pym/cache/anydbm.py +++ b/pym/cache/anydbm.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: anydbm.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ anydbm_module = __import__("anydbm") try: diff --git a/pym/cache/cache_errors.py b/pym/cache/cache_errors.py index 2f5b831bf..f63e5994b 100644 --- a/pym/cache/cache_errors.py +++ b/pym/cache/cache_errors.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: cache_errors.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ class CacheError(Exception): pass diff --git a/pym/cache/flat_hash.py b/pym/cache/flat_hash.py index 3a49a05de..59b00e8d4 100644 --- a/pym/cache/flat_hash.py +++ b/pym/cache/flat_hash.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: flat_list.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ import fs_template import cache_errors diff --git a/pym/cache/fs_template.py b/pym/cache/fs_template.py index 49d5ca073..c63856da1 100644 --- a/pym/cache/fs_template.py +++ b/pym/cache/fs_template.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: fs_template.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ import os import template, cache_errors diff --git a/pym/cache/mappings.py b/pym/cache/mappings.py index 2251c4449..9aa5a21e2 100644 --- a/pym/cache/mappings.py +++ b/pym/cache/mappings.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: mappings.py 2015 2005-09-20 23:14:26Z ferringb $ +# $Id$ import UserDict diff --git a/pym/cache/metadata.py b/pym/cache/metadata.py index 1fb19b398..329af224c 100644 --- a/pym/cache/metadata.py +++ b/pym/cache/metadata.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: metadata.py 1964 2005-09-03 00:16:16Z ferringb $ +# $Id$ import os, stat, types import flat_hash diff --git a/pym/cache/sql_template.py b/pym/cache/sql_template.py index c69ed772f..92e9e8713 100644 --- a/pym/cache/sql_template.py +++ b/pym/cache/sql_template.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: sql_template.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ import template, cache_errors from template import reconstruct_eclasses diff --git a/pym/cache/template.py b/pym/cache/template.py index 097ebed8d..419ec08a4 100644 --- a/pym/cache/template.py +++ b/pym/cache/template.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: template.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ import cache_errors from mappings import ProtectedDict diff --git a/pym/cache/util.py b/pym/cache/util.py index 204b549b6..0c8e585fd 100644 --- a/pym/cache/util.py +++ b/pym/cache/util.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: util.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ import cache_errors diff --git a/pym/cvstree.py b/pym/cvstree.py index 6e91af9ef..53b9f6222 100644 --- a/pym/cvstree.py +++ b/pym/cvstree.py @@ -1,7 +1,7 @@ # cvstree.py -- cvs tree utilities # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/cvstree.py,v 1.12.2.1 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ import string,os,time,sys,re diff --git a/pym/dispatch_conf.py b/pym/dispatch_conf.py index 9ca57f0da..9e2c0bd2d 100644 --- a/pym/dispatch_conf.py +++ b/pym/dispatch_conf.py @@ -1,7 +1,7 @@ # archive_conf.py -- functionality common to archive-conf and dispatch-conf # Copyright 2003-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/dispatch_conf.py,v 1.3.2.3 2005/04/29 03:37:30 jstubbs Exp $ +# $Id$ # Library by Wayne Davison <gentoo@blorf.net>, derived from code diff --git a/pym/elog_modules/mod_mail.py b/pym/elog_modules/mod_mail.py index 68771ba51..cc67015f7 100644 --- a/pym/elog_modules/mod_mail.py +++ b/pym/elog_modules/mod_mail.py @@ -37,6 +37,7 @@ def process(mysettings, cpv, logentries, fulltext): mymessage.set_unixfrom(myfrom) mymessage.set_payload(fulltext) mymessage["To"] = myrecipient + mymessage["From"] = myfrom mysubject = mysettings["PORTAGE_ELOG_MAILSUBJECT"] mysubject = mysubject.replace("${PACKAGE}", cpv) diff --git a/pym/emergehelp.py b/pym/emergehelp.py index 94f4d6732..ff6c4e6c8 100644 --- a/pym/emergehelp.py +++ b/pym/emergehelp.py @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/emergehelp.py,v 1.8.2.2 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ import os,sys diff --git a/pym/getbinpkg.py b/pym/getbinpkg.py index 0bd0d3622..2fe92b2de 100644 --- a/pym/getbinpkg.py +++ b/pym/getbinpkg.py @@ -1,7 +1,7 @@ # getbinpkg.py -- Portage binary-package helper functions # Copyright 2003-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/getbinpkg.py,v 1.12.2.3 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ from output import * diff --git a/pym/output.py b/pym/output.py index fe15ea471..375917411 100644 --- a/pym/output.py +++ b/pym/output.py @@ -1,6 +1,6 @@ # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/output.py,v 1.24.2.4 2005/04/17 09:01:55 jstubbs Exp $ +# $Id$ import commands,errno,os,re,shlex,sys diff --git a/pym/portage.py b/pym/portage.py index ffeed06a1..f65b43c6c 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1,10 +1,10 @@ # portage.py -- core Portage functionality # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.76 2005/05/29 12:40:08 jstubbs Exp $ +# $Id$ -VERSION="$Rev$"[6:-2] + "-svn" +VERSION="$Rev: 3387 $"[6:-2] + "-svn" # =========================================================================== # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT diff --git a/pym/portage_checksum.py b/pym/portage_checksum.py index 30f221532..fd659eea2 100644 --- a/pym/portage_checksum.py +++ b/pym/portage_checksum.py @@ -1,7 +1,7 @@ # portage_checksum.py -- core Portage functionality # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_checksum.py,v 1.10.2.2 2005/08/10 05:42:03 ferringb Exp $ +# $Id$ from portage_const import PRIVATE_PATH,PRELINK_BINARY,HASHING_BLOCKSIZE diff --git a/pym/portage_const.py b/pym/portage_const.py index 1820a3ac5..faf20c2c3 100644 --- a/pym/portage_const.py +++ b/pym/portage_const.py @@ -1,7 +1,7 @@ # portage: Constants # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_const.py,v 1.3.2.3 2005/04/29 04:56:35 jstubbs Exp $ +# $Id$ # =========================================================================== diff --git a/pym/portage_data.py b/pym/portage_data.py index 1f2e67e57..99874fcf4 100644 --- a/pym/portage_data.py +++ b/pym/portage_data.py @@ -1,7 +1,7 @@ # portage_data.py -- Calculated/Discovered Data Values # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_data.py,v 1.5.2.2 2005/02/26 11:22:38 carpaski Exp $ +# $Id$ import os,pwd,grp diff --git a/pym/portage_dep.py b/pym/portage_dep.py index dc0ee4d14..ece3c72dc 100644 --- a/pym/portage_dep.py +++ b/pym/portage_dep.py @@ -1,7 +1,7 @@ # deps.py -- Portage dependency resolution functions # Copyright 2003-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_dep.py,v 1.15.2.3 2005/04/02 14:07:59 jstubbs Exp $ +# $Id$ # DEPEND SYNTAX: diff --git a/pym/portage_exception.py b/pym/portage_exception.py index c90b17567..57eafb505 100644 --- a/pym/portage_exception.py +++ b/pym/portage_exception.py @@ -1,6 +1,6 @@ # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_exception.py,v 1.8.2.1 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ class PortageException(Exception): diff --git a/pym/portage_exec.py b/pym/portage_exec.py index 4f7fef2b9..cfa605918 100644 --- a/pym/portage_exec.py +++ b/pym/portage_exec.py @@ -1,7 +1,7 @@ # portage.py -- core Portage functionality # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_exec.py,v 1.13.2.4 2005/04/17 09:01:56 jstubbs Exp $ +# $Id$ import os, atexit, signal, sys diff --git a/pym/portage_file.py b/pym/portage_file.py index 970d42fbb..711ba098b 100644 --- a/pym/portage_file.py +++ b/pym/portage_file.py @@ -1,7 +1,7 @@ # portage_data.py -- Calculated/Discovered Data Values # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_file.py,v 1.3.2.1 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ import os diff --git a/pym/portage_gpg.py b/pym/portage_gpg.py index 2465b18a7..04ed60046 100644 --- a/pym/portage_gpg.py +++ b/pym/portage_gpg.py @@ -1,7 +1,7 @@ # portage_gpg.py -- core Portage functionality # Copyright 2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_gpg.py,v 1.6.2.1 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ import os diff --git a/pym/portage_localization.py b/pym/portage_localization.py index ba47b06b0..59ccea711 100644 --- a/pym/portage_localization.py +++ b/pym/portage_localization.py @@ -1,7 +1,7 @@ # portage_localization.py -- Code to manage/help portage localization. # Copyright 2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_localization.py,v 1.2.2.1 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ # We define this to make the transition easier for us. diff --git a/pym/portage_locks.py b/pym/portage_locks.py index 30946c437..4c7da6d31 100644 --- a/pym/portage_locks.py +++ b/pym/portage_locks.py @@ -1,7 +1,7 @@ # portage: Lock management code # Copyright 2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_locks.py,v 1.18.2.2 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ import errno diff --git a/pym/portage_util.py b/pym/portage_util.py index 58827489d..8adc483e5 100644 --- a/pym/portage_util.py +++ b/pym/portage_util.py @@ -1,6 +1,6 @@ # Copyright 2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_util.py,v 1.11.2.6 2005/04/23 07:26:04 jstubbs Exp $ +# $Id$ from portage_exception import PortageException, FileNotFound, OperationNotPermitted, ReadOnlyFileSystem diff --git a/pym/xpak.py b/pym/xpak.py index c5c487e0a..46cdfd8df 100644 --- a/pym/xpak.py +++ b/pym/xpak.py @@ -1,6 +1,6 @@ # Copyright 2001-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/xpak.py,v 1.13.2.3 2005/02/26 11:22:38 carpaski Exp $ +# $Id$ # The format for a tbz2/xpak: diff --git a/src/bsd-flags/chflags.c b/src/bsd-flags/chflags.c index 2d3ff8294..fc571d732 100644 --- a/src/bsd-flags/chflags.c +++ b/src/bsd-flags/chflags.c @@ -1,4 +1,4 @@ -/* $Id: /var/cvsroot/gentoo-src/portage/src/bsd-flags/chflags.c,v 1.1.2.2 2005/02/13 10:48:31 jstubbs Exp $ */ +/* $Id$ */ #include "Python.h" diff --git a/src/bsd-flags/setup.cfg b/src/bsd-flags/setup.cfg index e9518664f..83f861d00 100644 --- a/src/bsd-flags/setup.cfg +++ b/src/bsd-flags/setup.cfg @@ -1,5 +1,5 @@ # bsd-flags -# $Id: /var/cvsroot/gentoo-src/portage/src/bsd-flags/setup.cfg,v 1.1.2.1 2005/02/06 12:56:40 carpaski Exp $ +# $Id$ [bdist_rpm] release = 1 diff --git a/src/bsd-flags/setup.py b/src/bsd-flags/setup.py index 484139747..26ee8ca0f 100755 --- a/src/bsd-flags/setup.py +++ b/src/bsd-flags/setup.py @@ -1,5 +1,5 @@ #! /usr/bin/env python -# $Id: /var/cvsroot/gentoo-src/portage/src/bsd-flags/setup.py,v 1.1.2.1 2005/02/06 12:56:40 carpaski Exp $ +# $Id$ from os import chdir, stat from distutils.core import setup, Extension diff --git a/src/python-missingos/ChangeLog b/src/python-missingos/ChangeLog index 345a2d439..acec66bd8 100644 --- a/src/python-missingos/ChangeLog +++ b/src/python-missingos/ChangeLog @@ -1,4 +1,4 @@ -# $Id: /var/cvsroot/gentoo-src/portage/src/python-missingos/ChangeLog,v 1.4 2003/03/22 14:24:38 carpaski Exp $ +# $Id$ python-missingos ChangeLog Jonathon D Nelson <jnelson@gentoo.org> diff --git a/src/python-missingos/README b/src/python-missingos/README index 220b03fb3..f776fed45 100644 --- a/src/python-missingos/README +++ b/src/python-missingos/README @@ -1,4 +1,4 @@ -# $Id: /var/cvsroot/gentoo-src/portage/src/python-missingos/README,v 1.5.2.1 2004/10/22 16:53:30 carpaski Exp $ +# $Id$ python-missingos Jonathon D Nelson <jnelson@gentoo.org> diff --git a/src/python-missingos/missingos.c b/src/python-missingos/missingos.c index 7bf460ef1..4e4ad96ee 100644 --- a/src/python-missingos/missingos.c +++ b/src/python-missingos/missingos.c @@ -1,4 +1,4 @@ -/* $Id: /var/cvsroot/gentoo-src/portage/src/python-missingos/missingos.c,v 1.5.2.1 2004/10/22 16:53:30 carpaski Exp $ */ +/* $Id$ */ #include "Python.h" diff --git a/src/python-missingos/setup.cfg b/src/python-missingos/setup.cfg index 4fbba37c6..d43ea60e0 100644 --- a/src/python-missingos/setup.cfg +++ b/src/python-missingos/setup.cfg @@ -1,5 +1,5 @@ # python-missingos -# $Id: /var/cvsroot/gentoo-src/portage/src/python-missingos/setup.cfg,v 1.4.2.1 2004/10/22 16:53:30 carpaski Exp $ +# $Id$ [bdist_rpm] release = 1 diff --git a/src/python-missingos/setup.py b/src/python-missingos/setup.py index 807eb01ce..f2d254beb 100755 --- a/src/python-missingos/setup.py +++ b/src/python-missingos/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# $Id: /var/cvsroot/gentoo-src/portage/src/python-missingos/setup.py,v 1.5.2.1 2004/10/22 16:53:30 carpaski Exp $ +# $Id$ from os import chdir, stat from distutils.core import setup, Extension diff --git a/src/tbz2tool.c b/src/tbz2tool.c index 1033a57f7..af7628140 100644 --- a/src/tbz2tool.c +++ b/src/tbz2tool.c @@ -1,4 +1,4 @@ -/* $Id: /var/cvsroot/gentoo-src/portage/src/tbz2tool.c,v 1.3.2.1 2004/11/05 13:49:22 jstubbs Exp $ */ +/* $Id$ */ #include <stdio.h> #include <stdlib.h> diff --git a/tarball.sh b/tarball.sh index c9718bcf5..1422fce2e 100755 --- a/tarball.sh +++ b/tarball.sh @@ -1,5 +1,5 @@ #!/bin/bash -# $Id: /var/cvsroot/gentoo-src/portage/Attic/tarball.sh,v 1.181.2.2 2005/05/01 16:04:51 jstubbs Exp $ +# $Id$ if [ -z "$1" ]; then echo |