[patch] emerge.diff; changes to portage 2.0.36 to supress the spinner if stdout is not a tty

emerge.2.3.diff (text/plain), 1.77 KB, created by Toby Dickenson on 2002-09-18 18:11:21 UTC

*** emerge.2	Thu Sep 19 00:04:04 2002
--- emerge	Thu Sep 19 00:05:02 2002
***************
*** 60,63 ****
--- 60,71 ----
  	"i":"inject"}
  
+ def update_spinner():
+ 	global spinner, spinpos
+ 	if sys.stdout.isatty():
+ 		sys.stdout.write("\b"+spinner[spinpos])
+ 		spinpos=(spinpos+1)%8
+ 		sys.stdout.flush()
+ 
+ 	
  def help():
  	if not myaction:
***************
*** 397,403 ****
  			self.searchkey==".*"
  		for package in portage.portdb.cp_all():
! 			sys.stdout.write("\b"+spinner[spinpos])
! 			spinpos=(spinpos+1)%8
! 			sys.stdout.flush()
  			package_parts=package.split("/")
  			masked=0
--- 405,409 ----
  			self.searchkey==".*"
  		for package in portage.portdb.cp_all():
! 			update_spinner()
  			package_parts=package.split("/")
  			masked=0
***************
*** 569,578 ****
  			#this conditional is needed to prevent infinite recursion on already-processed deps
  			return 1
! 		
! 		#update our groovy spinner
! 		global spinner, spinpos
! 		sys.stdout.write("\b"+spinner[spinpos])
! 		spinpos=(spinpos+1)%8
! 		sys.stdout.flush()
  	
  		mytype,myroot,mykey=mybigkey
--- 575,580 ----
  			#this conditional is needed to prevent infinite recursion on already-processed deps
  			return 1
! 
! 		update_spinner()
  	
  		mytype,myroot,mykey=mybigkey
***************
*** 1335,1341 ****
  			mymatches=portage.portdb.xmatch("match-all",x)
  			for y in mymatches:
! 				sys.stdout.write("\b"+spinner[spinpos])
! 				spinpos=(spinpos+1)%8
! 				sys.stdout.flush()
  				curdbkey=portage.settings["PORTAGE_CACHEDIR"]+"/"+y
  				newdbkey=myportdir+"/metadata/cache/"+y
--- 1337,1341 ----
  			mymatches=portage.portdb.xmatch("match-all",x)
  			for y in mymatches:
! 				update_spinner()
  				curdbkey=portage.settings["PORTAGE_CACHEDIR"]+"/"+y
  				newdbkey=myportdir+"/metadata/cache/"+y