patch against emerge from 2.0.36

emerge.diff (text/plain), 2.96 KB, created by Jeremy Gebben on 2002-09-08 11:33:19 UTC

*** bin/emerge	Sun Sep  8 09:58:51 2002
--- new/bin/emerge	Sat Sep  7 21:29:27 2002
***************
*** 27,32 ****
--- 27,33 ----
  	"--nodeps",
  	"--emptytree",
  	"--fetchonly",
+ 	"--fetchlist",
  	"--noreplace",
  	"--onlydeps",
  	"--pretend",
***************
*** 45,50 ****
--- 46,52 ----
  	"e":"--emptytree",
  	"d":"--debug",
  	"f":"--fetchonly",
+ 	"F":"--fetchlist",
  	"h":"--help",
  	"k":"--usepkg",
  	"n":"--noreplace",
***************
*** 163,168 ****
--- 165,175 ----
  		print "              Instead of doing any package building, just perform fetches for"
  		print "              all packages (main package as well as all dependencies.)"
  		print
+ 		print "       "+green("--fetchlist")+" ("+green("-F")+" short option)"
+ 		print "              Instead of doing any package building, output a shell script that"
+ 		print "              can be used to download the required packages on a different computer."
+ 		print "              This is mainly useful for users with a slow (or no) internet connection."
+ 		print
  		print "       "+green("--nodeps")
  		print "              Merge specified packages, but don't merge any dependencies."
  		print "              Note that the build may fail if deps aren't satisfied."
***************
*** 916,921 ****
--- 923,930 ----
  						print "!!! Fetch for",y,"failed, continuing..."
  						print	
  						returnme=1
+ 				elif "--fetchlist" in myopts:
+ 					returnme=portage.doebuild(y,"fetchlist",myroot,edebug)
  				elif "--buildpkg" in myopts:
  					#create pkg, then merge pkg
  					retval=portage.doebuild(y,"clean",myroot,edebug)
***************
*** 947,953 ****
  				#need to check for errors
  			portage.db[x[1]]["vartree"].inject(x[2])
  			myfavkey=portage.cpv_getkey(x[2])
! 			if (not "--fetchonly" in myopts) and (myfavkey in favorites):
  				myfavs=portage.grabfile(myroot+"var/cache/edb/world")
  				myfavdict=genericdict(myfavs)
  				mysysdict=genericdict(syslist)
--- 956,962 ----
  				#need to check for errors
  			portage.db[x[1]]["vartree"].inject(x[2])
  			myfavkey=portage.cpv_getkey(x[2])
! 			if (not ("--fetchonly" in myopts or "--fetchlist" in myopts)) and (myfavkey in favorites):
  				myfavs=portage.grabfile(myroot+"var/cache/edb/world")
  				myfavdict=genericdict(myfavs)
  				mysysdict=genericdict(syslist)
***************
*** 963,969 ****
  					sys.exit(1)
  		#my doing an exit this way, --fetchonly can continue to try to
  		#fetch everything even if a particular download fails.
! 		if "--fetchonly" in myopts:
  			if returnme:
  				print "\n\n!!! Some fetch errors were encountered.  Please see above for details.\n\n"
  				sys.exit(returnme)
--- 972,978 ----
  					sys.exit(1)
  		#my doing an exit this way, --fetchonly can continue to try to
  		#fetch everything even if a particular download fails.
! 		if "--fetchonly" in myopts or "--fetchlist" in myopts:
  			if returnme:
  				print "\n\n!!! Some fetch errors were encountered.  Please see above for details.\n\n"
  				sys.exit(returnme)