diff options
| -rwxr-xr-x | bin/emerge | 34 | ||||
| -rw-r--r-- | pym/emergehelp.py | 49 | ||||
| -rw-r--r-- | pym/portage.py | 12 |
3 files changed, 59 insertions, 36 deletions
diff --git a/bin/emerge b/bin/emerge index 40691a3b3..e91a18692 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1346,7 +1346,7 @@ class depgraph: binpkguseflags=portage.db[portage.root]["bintree"].get_use(myeb_pkg) myk=["binary",myroot,myeb_pkg] else: - sys.stderr.write("!!! Confused... Don't know what I'm using for dependency info. :(\n") + sys.stderr.write("!!! Confused... Don't know what's being used for dependency info. :(\n") sys.exit(1) #if "--usepkg" in myopts: @@ -1972,8 +1972,8 @@ class depgraph: pkgindex=3 y=portage.portdb.findname(x[pkgindex]) if not "--pretend" in myopts: - print ">>> emerge ("+str(mergecount)+" of "+str(len(mymergelist))+")",x[pkgindex],"to",x[1] - emergelog(" >>> emerge ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1]) + print ">>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+")",x[pkgindex],"to",x[1] + emergelog(" >>> Emerging ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" to "+x[1]) self.pkgsettings["EMERGE_FROM"] = x[0][:] self.pkgsettings.backup_changes("EMERGE_FROM") @@ -2265,7 +2265,7 @@ def unmerge(unmerge_action, unmerge_files): candidate_catpkgs.append("="+string.join(sp_absx[sp_vdb_len:],"/")) if (("--pretend" in myopts) or ("--ask" in myopts)) and not ("--quiet" in myopts): - print darkgreen("\n>>> These are the packages that I would unmerge:") + print darkgreen("\n>>> These are the packages that would be unmerged:") pkgmap={} numselected=0 @@ -2328,7 +2328,7 @@ def unmerge(unmerge_action, unmerge_files): return 0 if not numselected: - print "\n>>>",unmerge_action+": No packages selected for removal.\n" + print "\n>>> No packages selected for removal by",unmerge_action+".\n" return 0 for x in pkgmap.keys(): @@ -2665,15 +2665,15 @@ if myaction in ["sync","rsync","metadata"] and (not "--help" in myopts): print "Quitting." print sys.exit(0) - emergelog(">>> starting rsync with "+dosyncuri) + emergelog(">>> Starting rsync with "+dosyncuri) if "--quiet" not in myopts: - print ">>> starting rsync with "+dosyncuri+"..." + 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: - print ">>> checking server timestamp ..." + print ">>> Checking server timestamp ..." mycommand=rsynccommand+" "+dosyncuri+"/metadata/timestamp.chk "+tmpservertimestampdir exitcode=portage.spawn(mycommand,portage.settings,free=1) if (exitcode==0): @@ -2712,7 +2712,7 @@ if myaction in ["sync","rsync","metadata"] and (not "--help" in myopts): retries=retries+1 if retries<=maxretries: - print ">>> retry ..." + print ">>> Retrying..." time.sleep(11) else: # over retries @@ -2753,7 +2753,7 @@ if myaction in ["sync","rsync","metadata"] and (not "--help" in myopts): cvsdir=os.path.dirname(myportdir) if not os.path.exists(myportdir+"/CVS"): #initial checkout - print ">>> starting initial cvs checkout with "+syncuri+"..." + print ">>> Starting initial cvs checkout with "+syncuri+"..." if not portage.spawn("cd "+cvsdir+"; cvs -d "+cvsroot+" login",portage.settings,free=1): print "!!! cvs login error; exiting." sys.exit(1) @@ -2768,7 +2768,7 @@ if myaction in ["sync","rsync","metadata"] and (not "--help" in myopts): sys.exit(0) else: #cvs update - print ">>> starting cvs update with "+syncuri+"..." + print ">>> Starting cvs update with "+syncuri+"..." sys.exit(portage.spawn("cd "+myportdir+"; cvs -z0 -q update -dP",portage.settings,free=1)) else: print "!!! rsync setting: ",syncuri,"not recognized; exiting." @@ -3141,7 +3141,7 @@ elif "depclean"==myaction: print "\n!!! Failed to create deptree." sys.exit(1) if not ("--quiet" in myopts): - print "\b\b ... done!" + print "\b\b... done!" if ("--usepkgonly" in myopts) and mydepgraph.missingbins: sys.stderr.write(red("The following binaries are not available for merging...\n")) @@ -3219,11 +3219,11 @@ else: 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 "--tree" in myopts: print - print darkgreen("These are the packages that I would merge, in reverse order:") + print darkgreen("These are the packages that would be merged, in reverse order:") print else: print - print darkgreen("These are the packages that I would merge, in order:") + print darkgreen("These are the packages that would be merged, in order:") print if ("--resume" in myopts) and portage.mtimedb.has_key("resume"): @@ -3255,7 +3255,7 @@ else: print "!!! Depgraph creation failed." sys.exit(1) if not ("--quiet" in myopts): - print "\b\b ...done!" + print "\b\b... done!" else: if not myfiles: print "emerge: please tell me what to do." @@ -3269,7 +3269,7 @@ else: if not retval: sys.exit(1) if not ("--quiet" in myopts): - print "\b\b ...done!" + print "\b\b... done!" if ("--usepkgonly" in myopts) and mydepgraph.missingbins: sys.stderr.write(red("The following binaries are not available for merging...\n")) @@ -3354,6 +3354,6 @@ else: if portage.mtimedb.has_key("resume"): del portage.mtimedb["resume"] if portage.settings["AUTOCLEAN"] and "yes"==portage.settings["AUTOCLEAN"]: - print ">>> Auto-cleaning packages ..." + print ">>> Auto-cleaning packages..." unmerge("clean", ["world"]) post_emerge() diff --git a/pym/emergehelp.py b/pym/emergehelp.py index 9a80de50d..9956a9469 100644 --- a/pym/emergehelp.py +++ b/pym/emergehelp.py @@ -14,7 +14,7 @@ def shorthelp(): print " "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] < "+turquoise("system")+" | "+turquoise("world")+" >" print " "+turquoise("emerge")+" < "+turquoise("--sync")+" | "+turquoise("--metadata")+" | "+turquoise("--info")+" >" print " "+turquoise("emerge")+" "+turquoise("--resume")+" [ "+green("--pretend")+" | "+green("--ask")+" | "+green("--skipfirst")+" ]" - print " "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("config")+" | "+green("sync")+" ] " + print " "+turquoise("emerge")+" "+turquoise("--help")+" [ "+green("system")+" | "+green("world")+" | "+green("config")+" | "+green("sync")+" ] " print bold("Options:")+" "+green("-")+"["+green("abcCdDefhikKlnNoOpPsSuUvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]" print " ["+green("--columns")+"] ["+green("--nospinner")+"]" print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]" @@ -323,18 +323,41 @@ def help(myaction,myopts,havecolor=1): print print bold("Usage: ")+turquoise("emerge")+" [ "+green("options")+" ] "+turquoise("system") print - print " \"emerge system\" is the Portage system update command. When run, it" - print " will scan the etc/make.profile/packages file and determine what" - print " packages need to be installed so that your system meets the minimum" - print " requirements of your current system profile. Note that this doesn't" - print " necessarily bring your system up-to-date at all; instead, it just" - print " ensures that you have no missing parts. For example, if your system" - print " profile specifies that you should have sys-apps/iptables installed" - print " and you don't, then \"emerge system\" will install it (the most" - print " recent version that matches the profile spec) for you. It's always a" - print " good idea to do an \"emerge --pretend system\" before an \"emerge" - print " system\", just so you know what emerge is planning to do." - print + print " \"emerge system\" is a special set defined by your profile." + print " Portage will scan /etc/make.profile/packages and determine what" + print " packages end up in the \"system\" set. The goal of the \"system\"" + print " set is to provide a minimum set of packages for a system to operate." + print " If you wish to check that your system has all it's core components," + print " an \"emerge -p system\" will tell you if you are missing anything." + print " The \"system\" set is also useful for updating core components. One" + print " can do \"emerge --update --deep system\" to update core components" + print " and their dependencies. Also useful is the --emptytree option which" + print " forces a rebuild of the packages in the \"system\" set. In all cases" + print " when the \"system\" set is being used, --ask or --pretend are also" + print " highly recommended due to the fact that the \"system\" set may pull" + print " in large number of packages." + print " Note: The \"system\" set is a subset of the \"world\" set. To update" + print " the packages that you have installed, use the \"world\" set." + print + elif myaction=="world": + print + print bold("Usage: ")+turquoise("emerge")+" [ "+green("options")+" ] "+turquoise("world") + print + print " \"world\" is a special set that you can give to emerge on the command" + print " line. It will read the file at /var/lib/portage/world and will process" + print " those packages. The \"world\" set also includes all the packages in" + print " the \"system\" set. See the help on the \"system\" set for what is" + print " contained in it. Using the \"world\" set, users can keep their entire" + print " system up to date by doing an \"emerge --update --deep world\". This" + print " command tells portage to update all packages in world, as well as their" + print " deep dependencies. Another useful command is \"emerge --newuse world\"" + print " which will emerge any packages that have changed USE flags. In either" + print " case, using --ask or --pretend with the \"world\" set is highly" + print " recommended as the \"world\" set may pull in a large number of packages." + print " Note: The world set is only a subset of all installed packages. Using" + print " the --deep switch with the \"world\" set is important to updating all" + print " package dependencies." + print elif myaction=="config": outstuff=green("Config file management support (preliminary)")+""" diff --git a/pym/portage.py b/pym/portage.py index 49fc4413c..c027bd236 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2137,7 +2137,7 @@ def digestgen(myarchives,mysettings,overwrite=1,manifestonly=0): if (not overwrite) and os.path.exists(digestfn): return 1 - print green(">>> Generating digest file...") + print green(">>> Generating the digest file...") # Track the old digest so we can assume checksums without requiring # all files to be downloaded. 'Assuming' @@ -2173,7 +2173,7 @@ def digestgen(myarchives,mysettings,overwrite=1,manifestonly=0): except Exception,e: print e - print green(">>> Generating manifest file...") + print green(">>> Generating the manifest file...") mypfiles=listdir(pbasedir,recursive=1,filesonly=1,ignorecvs=1,EmptyOnError=1) mypfiles=cvstree.apply_cvsignore_filter(mypfiles) mypfiles.sort() @@ -6075,7 +6075,7 @@ class dblink: self.dbdir = self.dbpkgdir self.unmerge(oldcontents,trimworld=0) self.dbdir = self.dbtmpdir - writemsg_stdout(">>> original instance of package unmerged safely.\n") + writemsg_stdout(">>> Original instance of package unmerged safely.\n") # We hold both directory locks. self.dbdir = self.dbpkgdir @@ -6512,7 +6512,7 @@ def pkgmerge(mytbz2,myroot,mysettings): shutil.rmtree(tmploc+"/"+mypkg,1) os.makedirs(pkgloc) os.makedirs(infloc) - writemsg_stdout(">>> extracting info\n") + writemsg_stdout(">>> Extracting info\n") xptbz2.unpackinfo(infloc) # run pkg_setup early, so we can bail out early # (before extracting binaries) if there's a problem @@ -6521,10 +6521,10 @@ def pkgmerge(mytbz2,myroot,mysettings): mysettings.configdict["pkg"]["CATEGORY"] = mycat; a=doebuild(myebuild,"setup",myroot,mysettings,tree="bintree") - writemsg_stdout(">>> extracting %s\n" % mypkg) + writemsg_stdout(">>> Extracting %s\n" % mypkg) notok=spawn("bzip2 -dqc -- '"+mytbz2+"' | tar xpf -",mysettings,free=1) if notok: - print "!!! Error extracting",mytbz2 + print "!!! Error Extracting",mytbz2 cleanup_pkgmerge(mypkg,origdir) return None |