diff options
| -rwxr-xr-x | bin/emerge | 8 | ||||
| -rw-r--r-- | make.conf.txt | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/bin/emerge b/bin/emerge index 034feafb9..7abf52714 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4314,10 +4314,14 @@ def parse_opts(tmpcmdline, silent=False): if x in actions: if x not in ["system", "world"]: print red("*** Deprecated use of action '%s', use '--%s' instead" % (x,x)) - if myaction: + # special case "search" so people can search for action terms, e.g. emerge -s sync + if myaction and myaction != "search": multiple_actions(myaction, x) sys.exit(1) - myaction=x + if myaction != "search": + myaction=x + else: + myfiles.append(x) else: myfiles.append(x) diff --git a/make.conf.txt b/make.conf.txt index 611aae360..6d1905909 100644 --- a/make.conf.txt +++ b/make.conf.txt @@ -224,7 +224,7 @@ _`keepwork` may occupy a lot of diskspace. _`metadata-transfer` - Automatically perform a metadata transfer when `emerge --sync` is run. + Automatically perform a metadata transfer when emerge --sync is run. _`mirror` This will cause `FETCHCOMMAND`_ to always be run even if the file already @@ -511,7 +511,7 @@ PORTAGE_RSYNC_EXTRA_OPTS :suggest: --exclude=/etc/portage/rsync_exclude :valdesc: rsync options -Additional rsync options to be used by `emerge --sync`. +Additional rsync options to be used by emerge --sync. PORTAGE_RSYNC_OPTS ------------------ @@ -519,7 +519,7 @@ PORTAGE_RSYNC_OPTS :default: --recursive --links --safe-links --perms --times --compress --force --whole-file --delete --delete-after --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages :valdesc: rsync options -Default rsync options to be used by `emerge --sync`. **Don't change this unless +Default rsync options to be used by emerge --sync. **Don't change this unless you know exactly what you're doing!** PORTAGE_RSYNC_RETRIES @@ -619,7 +619,7 @@ SYNC :valdesc: URI to a portage tree server (rsync or cvs) Insert your preferred rsync mirror here. This rsync server is used to sync -the local portage tree when `emerge --sync` is run. Only one server can be +the local portage tree when emerge --sync is run. Only one server can be specified. USE |