diff options
| author |   Jason Stubbs <jstubbs@gentoo.org> | 2005-02-15 23:27:44 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-02-15 23:27:44 +0000 |
| commit | 9fa85ff2d4d049ad07249147c051d44facbfc331 (patch) | |
| tree | 26d0ded4125fc3c08164fcba27966fa60e90da42 | |
| parent | portage.py: Fixed the global features usage in the config class and made (diff) | |
| download | portage-cvs-9fa85ff2d4d049ad07249147c051d44facbfc331.tar.gz portage-cvs-9fa85ff2d4d049ad07249147c051d44facbfc331.tar.bz2 portage-cvs-9fa85ff2d4d049ad07249147c051d44facbfc331.zip | |
emerge: Disabled the cache update output when using --quiet. #81678
make.conf*: Added warning with regard to changing CHOST. #81007
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rwxr-xr-x | bin/emerge | 18 | ||||
| -rw-r--r-- | cnf/make.conf | 3 | ||||
| -rw-r--r-- | cnf/make.conf.alpha | 3 | ||||
| -rw-r--r-- | cnf/make.conf.arm | 3 | ||||
| -rw-r--r-- | cnf/make.conf.hppa | 3 | ||||
| -rw-r--r-- | cnf/make.conf.x86 | 3 |
7 files changed, 29 insertions, 14 deletions
@@ -1,13 +1,19 @@ # ChangeLog for Portage; the Gentoo Linux ports system # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Id: ChangeLog,v 1.796.2.70 2005/02/13 10:48:30 jstubbs Exp $ +# $Id: ChangeLog,v 1.796.2.71 2005/02/15 23:27:44 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. - 13 Feb 2005; Jason Stubbs <jstubbs@gentoo.org> make.conf: Added warning + 15 Feb 2005; Jason Stubbs <jstubbs@gentoo.org> emerge: Disabled the cache + update output when using --quiet. #81678 + + 15 Feb 2005; Jason Stubbs <jstubbs@gentoo.org> make.conf*: Added + warning with regard to changing CHOST. #81007 + + 13 Feb 2005; Jason Stubbs <jstubbs@gentoo.org> make.conf*: Added warning with regard to changing PORTDIR and /etc/make.profile. 13 Feb 2005; Jason Stubbs <jstubbs@gentoo.org> portage.py: Fixed the global @@ -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/emerge,v 1.345.2.16 2005/02/11 01:57:33 ferringb Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.17 2005/02/15 23:27:44 jstubbs Exp $ import os,sys os.environ["PORTAGE_CALLER"]="emerge" @@ -2456,12 +2456,14 @@ if myaction in ["sync","rsync","metadata"] and (not "--help" in myopts): print sys.exit(0) emergelog(">>> starting rsync with "+dosyncuri) - print ">>> starting rsync with "+dosyncuri+"..." + if "--quiet" not in myopts: + print ">>> starting rsync with "+dosyncuri+"..." else: emergelog(">>> Starting retry %d of %d with %s" % (retries,maxretries,dosyncuri)) print "\n\n>>> Starting retry %d of %d with %s" % (retries,maxretries,dosyncuri) - print ">>> checking server timestamp ..." + if "--quiet" not in myopts: + print ">>> checking server timestamp ..." mycommand=rsynccommand+" "+dosyncuri+"/metadata/timestamp.chk "+tmpservertimestampdir exitcode=portage.spawn(mycommand,portage.settings,free=1) if (exitcode==0): @@ -2570,7 +2572,8 @@ if myaction in ["sync","rsync","metadata"] and (not "--help" in myopts): pass if os.path.exists(myportdir+"/metadata/cache") and updatecache_flg: - print "\n>>> Updating Portage cache: ", + if "--quiet" not in myopts: + print "\n>>> Updating Portage cache: ", os.umask(0002) cachedir = os.path.normpath(portage.settings.depcachedir) if cachedir in ["/", "/bin", "/dev", "/etc", "/home", @@ -2626,9 +2629,10 @@ if myaction in ["sync","rsync","metadata"] and (not "--help" in myopts): if current >= nextupdate: pcnt += 1 nextupdate += pcntcount - pcntstr = str(pcnt) - sys.stdout.write("\b"*(len(pcntstr)+1)+pcntstr+"%") - sys.stdout.flush() + if "--quiet" not in myopts: + pcntstr = str(pcnt) + sys.stdout.write("\b"*(len(pcntstr)+1)+pcntstr+"%") + sys.stdout.flush() myxsplit=x.split("/") mymatches=portage.portdb.xmatch("match-all",x) mymatches.sort() diff --git a/cnf/make.conf b/cnf/make.conf index f29dbde..6ee882b 100644 --- a/cnf/make.conf +++ b/cnf/make.conf @@ -1,6 +1,6 @@ # 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/cnf/make.conf,v 1.84.2.3 2005/02/13 10:48:30 jstubbs Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf,v 1.84.2.4 2005/02/15 23:27:44 jstubbs Exp $ # Contains local system settings for Portage system # Please review 'man make.conf' for more information. @@ -26,6 +26,7 @@ # Host Setting # ============ # +# DO NOT CHANGE THIS SETTING UNLESS YOU ARE USING STAGE1! # Change this line as appropriate (i686, i586, i486 or i386). # All modern systems (even Athlons) should use "i686-pc-linux-gnu". # All K6's are i586. diff --git a/cnf/make.conf.alpha b/cnf/make.conf.alpha index 6a44e39..751551a 100644 --- a/cnf/make.conf.alpha +++ b/cnf/make.conf.alpha @@ -1,6 +1,6 @@ # 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/cnf/make.conf.alpha,v 1.40.2.3 2005/02/13 10:48:30 jstubbs Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.alpha,v 1.40.2.4 2005/02/15 23:27:44 jstubbs Exp $ # Contains local system settings for Portage system # Please review 'man make.conf' for more information. @@ -26,6 +26,7 @@ # Host Setting # ============ # +# DO NOT CHANGE THIS SETTING UNLESS YOU ARE USING STAGE1! # The generic HOST setting on alpha is alpha-unknown-linux-gnu. If your machine # is an ev6 or ev67 based system you might want to use # either alphaev6-unknown-linux-gnu or alphaev67-unknown-linux-gnu accordingly. diff --git a/cnf/make.conf.arm b/cnf/make.conf.arm index b38787e..21bdf90 100644 --- a/cnf/make.conf.arm +++ b/cnf/make.conf.arm @@ -1,6 +1,6 @@ # 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/cnf/make.conf.arm,v 1.31.2.3 2005/02/13 10:48:30 jstubbs Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.arm,v 1.31.2.4 2005/02/15 23:27:44 jstubbs Exp $ # Contains local system settings for Portage system # Please review 'man make.conf' for more information. @@ -26,6 +26,7 @@ # Host Setting # ============ # +# DO NOT CHANGE THIS SETTING UNLESS YOU ARE USING STAGE1! # It's very important you select the right CHOST from the start. A wrong # CHOST could easily lead to weird errors either in compiling or running. # diff --git a/cnf/make.conf.hppa b/cnf/make.conf.hppa index 3cc3b37..473374c 100644 --- a/cnf/make.conf.hppa +++ b/cnf/make.conf.hppa @@ -1,6 +1,6 @@ # 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/cnf/make.conf.hppa,v 1.37.2.3 2005/02/13 10:48:30 jstubbs Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.hppa,v 1.37.2.4 2005/02/15 23:27:44 jstubbs Exp $ # Contains local system settings for Portage system # Please review 'man make.conf' for more information. @@ -26,6 +26,7 @@ # Host Setting # ============ # +# DO NOT CHANGE THIS SETTING UNLESS YOU ARE USING STAGE1! # The generic CHOST value for hppa is hppa-unknown-linux-gnu. # But you might want to use hppa1.1-unknown-linux-gnu or hppa2.0-unknown-linux-gnu # according to your station. diff --git a/cnf/make.conf.x86 b/cnf/make.conf.x86 index 384679e..6777e9d 100644 --- a/cnf/make.conf.x86 +++ b/cnf/make.conf.x86 @@ -1,6 +1,6 @@ # 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/cnf/make.conf.x86,v 1.5.2.3 2005/02/13 10:48:30 jstubbs Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/cnf/make.conf.x86,v 1.5.2.4 2005/02/15 23:27:44 jstubbs Exp $ # Contains local system settings for Portage system # Please review 'man make.conf' for more information. @@ -26,6 +26,7 @@ # Host Setting # ============ # +# DO NOT CHANGE THIS SETTING UNLESS YOU ARE USING STAGE1! # Change this line as appropriate (i686, i586, i486 or i386). # All modern systems (even Athlons) should use "i686-pc-linux-gnu". # All K6's are i586. |