Index: emerge
===================================================================
--- emerge	(revision 2417)
+++ emerge	(working copy)
@@ -326,6 +326,9 @@
 
 if ("--quiet" in myopts):
 	update_spinner = update_quiet_spinner
+	option_quiet = True
+else:
+	option_quiet = False
 
 # Always create packages if FEATURES=buildpkg
 # Imply --buildpkg if --buildpkgonly
@@ -813,7 +816,7 @@
 							print "!!! Exception:",e
 						mysum[0]=" [no/bad digest]"
 
-					if "--quiet" not in myopts:
+					if not option_quiet:
 						print "     ", darkgreen("Latest version available:"),myversion
 						print "     ", self.getInstallationStatus(mycat+'/'+mypkg)
 						print "     ", darkgreen("Size of downloaded files:"),mysum[0]
@@ -2243,7 +2246,7 @@
 				print "="+string.join(sp_absx[sp_vdb_len:],"/")
 				candidate_catpkgs.append("="+string.join(sp_absx[sp_vdb_len:],"/"))
 
-	if (("--pretend" in myopts) or ("--ask" in myopts)) and not ("--quiet" in myopts):
+	if (("--pretend" in myopts) or ("--ask" in myopts)) and not option_quiet:
 		print darkgreen("\n>>> These are the packages that I would unmerge:")
 
 	pkgmap={}
@@ -2554,7 +2557,7 @@
 			"--exclude='/packages'",    # Exclude packages  from consideration
 		]
 
-		if "--quiet" in myopts:
+		if option_quiet:
 			rsync_flags.append("--quiet")    # Shut up a lot
 		else:
 			rsync_flags.append("--progress") # Progress meter for each file
@@ -2645,13 +2648,13 @@
 						print
 						sys.exit(0)
 				emergelog(">>> starting rsync with "+dosyncuri)
-				if "--quiet" not in myopts:
+				if not option_quiet:
 					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)
 
-			if "--quiet" not in myopts:
+			if not option_quiet:
 				print ">>> checking server timestamp ..."
 			mycommand=rsynccommand+" "+dosyncuri+"/metadata/timestamp.chk "+tmpservertimestampdir
 			exitcode=portage.spawn(mycommand,portage.settings,free=1)
@@ -2761,7 +2764,7 @@
 		pass
 
 	if os.path.exists(myportdir+"/metadata/cache") and updatecache_flg:
-		if "--quiet" not in myopts:
+		if not option_quiet:
 			print "\n>>> Updating Portage cache:      ",
 		os.umask(0002)
 		cachedir = os.path.normpath(portage.settings.depcachedir)
@@ -2847,7 +2850,7 @@
 				sys.stdout.flush()
 
 
-		if "--quiet" in myopts:
+		if option_quiet:
 			def quicky_cpv_generator(cp_all_list):
 				for x in cp_all_list:
 					for y in pdb.cp_list(x):
@@ -2867,7 +2870,7 @@
 
 	chk_updated_cfg_files()
 
-	if(mybestpv != mypvs):
+	if(mybestpv != mypvs) and not option_quiet:
 		print
 		print red(" * ")+bold("An update to portage is available.")+" It is _highly_ recommended"
 		print red(" * ")+"that you update portage now, before any other packages are updated."
@@ -2887,7 +2890,7 @@
 	mynodes=portage.portdb.cp_all()
 	for x in mynodes:
 		mymatches=portage.portdb.xmatch("match-all",x)
-		if not "--quiet" in myopts:
+		if not option_quiet:
 			print "processing",x
 		for y in mymatches:
 			try:
@@ -3107,12 +3110,12 @@
 	emergelog(" >>> depclean")
 	mydepgraph=depgraph(myaction,myopts)
 
-	if not ("--quiet" in myopts):
+	if not option_quiet:
 		print "\nCalculating dependencies  ",
 	if not mydepgraph.xcreate("world"):
 		print "\n!!! Failed to create deptree."
 		sys.exit(1)
-	if not ("--quiet" in myopts):
+	if not option_quiet:
 		print "\b\b ... done!"
 
 	if ("--usepkgonly" in myopts) and mydepgraph.missingbins:
@@ -3188,7 +3191,7 @@
 else:
 	favorites=[]
 	syslist=getlist("system")
-	if ((("--pretend" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts)) or ("--ask" in myopts)) and not ("--quiet" in myopts):
+	if ((("--pretend" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts)) or ("--ask" in myopts)) and not option_quiet:
 		if "--tree" in myopts:
 			print
 			print darkgreen("These are the packages that I would merge, in reverse order:")
@@ -3220,13 +3223,13 @@
 
 		mydepgraph=depgraph(myaction,myopts)
 		if myaction in ["system","world"]:
-			if not ("--quiet" in myopts):
+			if not option_quiet:
 				print "Calculating",myaction,"dependencies  ",
 				sys.stdout.flush()
 			if not mydepgraph.xcreate(myaction):
 				print "!!! Depgraph creation failed."
 				sys.exit(1)
-			if not ("--quiet" in myopts):
+			if not option_quiet:
 				print "\b\b ...done!"
 		else:
 			if not myfiles:
@@ -3234,13 +3237,13 @@
 				help()
 				sys.exit(1)
 				#we don't have any files to process; skip this step and exit
-			if not ("--quiet" in myopts):
+			if not option_quiet:
 				print "Calculating dependencies  ",
 				sys.stdout.flush()
 			retval,favorites=mydepgraph.select_files(myfiles)
 			if not retval:
 				sys.exit(1)
-			if not ("--quiet" in myopts):
+			if not option_quiet:
 				print "\b\b ...done!"
 
 			if ("--usepkgonly" in myopts) and mydepgraph.missingbins: