From 95ba162c8d142582166f31d51d1a489b6b8b6994 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 22 Feb 2010 10:22:38 +0000 Subject: Enable --rebuilt-binaries automatically only when in --usepkgonly or --getbinpkgonly mode, since --usepkgonly behaves better in cases when the portage tree is not exactly the same revision that was used to build the packages. svn path=/main/trunk/; revision=15427 --- pym/_emerge/create_depgraph_params.py | 2 +- pym/_emerge/help.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pym') diff --git a/pym/_emerge/create_depgraph_params.py b/pym/_emerge/create_depgraph_params.py index 37bda4922..f8351831e 100644 --- a/pym/_emerge/create_depgraph_params.py +++ b/pym/_emerge/create_depgraph_params.py @@ -42,7 +42,7 @@ def create_depgraph_params(myopts, myaction): rebuilt_binaries = myopts.get('--rebuilt-binaries') if rebuilt_binaries is True or \ rebuilt_binaries != 'n' and \ - '--usepkg' in myopts and \ + '--usepkgonly' in myopts and \ myopts.get('--deep') is True and \ '--update' in myopts: myparams['rebuilt_binaries'] = True diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 7c6b334fc..867902a6c 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -511,7 +511,7 @@ def help(myopts, havecolor=1): "been rebuilt. Rebuilds are detected by comparison of " + \ "BUILD_TIME package metadata. This option is enabled " + \ "automatically when using binary packages " + \ - "(--usepkg or --getbinpkg) together with " + \ + "(--usepkgonly or --getbinpkgonly) together with " + \ "--update and --deep." for line in wrap(desc, desc_width): print(desc_indent + line) -- cgit v1.2.3-1-g7c22