Add --nousepkg-atoms, --useoldpkg-atoms and --reinstall-atoms flag to Portage

Add --nousepkg-atoms, --useoldpkg-atoms, and --reinstall-atoms flag to Portage

reinstall-atoms accepts a space separated list of package names or slot atoms. Emerge will treat matching packages as if they are not installed, and reinstall them if necessary.

useoldpkg-atoms accepts a space separated list of package names or slot atoms. Emerge will prefer matching binary packages over newer unbuilt packages. This is useful in case you want to request that a particular package won't be rebuilt from source.

nousepkg-atoms accepts a space separated list of package names or slot atoms. Emerge will ignore matching binary packages.

Change-Id: I0d73039c6a4cd63695b28ffc80215628e0e05c95

BUG=chromium-os:12507
TEST=Try out the flag

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=11e8f9a

[davidjames, 2011-02-24 20:03:51]

In Chromium OS, this feature is useful for ensuring that workon packages get
merged.

Besides this feature, we'll also need a feature for ignoring binary packages
(maybe --nousepkg-atoms or --rebuild-atoms ?). I've separated the two features
because the two are also useful separately -- you might want to reinstall
packages without rebuilding them, for instance.

[anush, 2011-03-10 18:09:39]

Could --nousepkg take optional values that can be used to not usepkgs on
them and if it is empty default to current --nousepkg ?

Isn't --reinstall equal to --oneshot ?

Thanks
Anush

On Thu, Feb 24, 2011 at 12:03 PM, <davidjames@chromium.org> wrote:

> Reviewers: zmedico_gentoo.org, anush,
>
> Message:
> In Chromium OS, this feature is useful for ensuring that workon packages
> get
> merged.
>
> Besides this feature, we'll also need a feature for ignoring binary
> packages
> (maybe --nousepkg-atoms or --rebuild-atoms ?). I've separated the two
> features
> because the two are also useful separately -- you might want to reinstall
> packages without rebuilding them, for instance.
>
>
>
>
>
>
>
> Description:
> Add --reinstall-atoms flag to Portage
>
> This option is a space separated list of package names or slot atoms.
> Emerge
> will treat matching packages as if they are not installed, and reinstall
> them
> if necessary. Implies --deep.
>
> Change-Id: I0d73039c6a4cd63695b28ffc80215628e0e05c95
>
> BUG=chromium-os:12507
> TEST=Try out the flag
>
> Please review this at http://codereview.chromium.org/6577024/
>
> SVN Base: http://git.chromium.org/git/portage_tool.git@cros-2.1.9
>
> Affected files:
>  M man/emerge.1
>  M pym/_emerge/depgraph.py
>  M pym/_emerge/main.py
>
>
> Index: man/emerge.1
> diff --git a/man/emerge.1 b/man/emerge.1
> index
>
297ac15975012d9280d9ffc04bad7a87d39a2d4f..d7ccaa2a61c5c7bdeb14a4e2dcb81e360939b0e2
> 100644
> --- a/man/emerge.1
> +++ b/man/emerge.1
> @@ -389,6 +389,11 @@ packages (fetch things from SRC_URI based upon USE
> setting).
>  Instead of doing any package building, just perform fetches for all
>  packages (fetch everything in SRC_URI regardless of USE setting).
>  .TP
> +.BR "\-\-reinstall-atoms " ATOMS
> +A space separated list of package names or slot atoms. Emerge will treat
> +matching packages as if they are not installed, and reinstall them if
> +necessary. Implies --deep.
> +.TP
>  .BR "\-\-getbinpkg [ y | n ] (\-g short option)"
>  Using the server and location defined in \fIPORTAGE_BINHOST\fR (see
>  \fBmake.conf\fR(5)), portage will download the information from each
> binary
> Index: pym/_emerge/depgraph.py
> diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
> index
>
6891b939a66abd7b9e6353cadf5d04cb74ce038b..650a936ce771f79b42c1b600799f045c77a77cdb
> 100644
> --- a/pym/_emerge/depgraph.py
> +++ b/pym/_emerge/depgraph.py
> @@ -115,6 +115,14 @@ class _frozen_depgraph_config(object):
>                                x = Atom("*/" + x, allow_wildcard=True)
>                        self.excluded_pkgs.add(x)
>
> +               self.reinstall_atoms =
> InternalPackageSet(allow_wildcard=True)
> +               for x in ' '.join(myopts.get("--reinstall-atoms",
> [])).split():
> +                       try:
> +                               x = Atom(x, allow_wildcard=True)
> +                       except portage.exception.InvalidAtom:
> +                               x = Atom("*/" + x, allow_wildcard=True)
> +                       self.reinstall_atoms.add(x)
> +
>  class _depgraph_sets(object):
>        def __init__(self):
>                # contains all sets added to the graph
> @@ -2846,6 +2854,7 @@ class depgraph(object):
>                dont_miss_updates = "--update" in self._frozen_config.myopts
>                use_ebuild_visibility = self._frozen_config.myopts.get(
>                        '--use-ebuild-visibility', 'n') != 'n'
> +               reinstall_atoms = self._frozen_config.reinstall_atoms
>                # Behavior of the "selective" parameter depends on
>                # whether or not a package matches an argument atom.
>                # If an installed package provides an old-style
> @@ -3129,6 +3138,10 @@ class depgraph(object):
>                                                        cur_use, cur_iuse)
>                                                if reinstall_for_flags:
>                                                        reinstall = True
> +                                       if not installed and \
> +
> reinstall_atoms.findAtomForPackage(pkg, \
> +
> modified_use=self._pkg_use_enabled(pkg)):
> +                                               reinstall = True
>                                        if not built:
>                                                myeb = pkg
>                                        matched_packages.append(pkg)
> Index: pym/_emerge/main.py
> diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
> index
>
40266943f00172499cbbf915c598802d0aeb1c7a..47cbc4e3d55a4a565ca7037989eec843f1f250fc
> 100644
> --- a/pym/_emerge/main.py
> +++ b/pym/_emerge/main.py
> @@ -598,6 +598,14 @@ def parse_opts(tmpcmdline, silent=False):
>                        "action" : "append"
>                },
>
> +               "--reinstall-atoms": {
> +                       "help"   :"A space separated list of package names
> or slot atoms. " + \
> +                               "Emerge will treat matching packages as if
> they are not " + \
> +                               "installed, and reinstall them if
> necessary. Implies --deep.",
> +
> +                       "action" : "append",
> +               },
> +
>                "--fail-clean": {
>                        "help"    : "clean temp files after build failure",
>                        "type"    : "choice",
> @@ -818,6 +826,31 @@ def parse_opts(tmpcmdline, silent=False):
>                        parser.error("Invalid Atom(s) in --exclude
> parameter: '%s' (only package names and slot atoms (with wildcards)
> allowed)\n" % \
>                                (",".join(bad_atoms),))
>
> +       if myoptions.reinstall_atoms:
> +               reinstall_atoms = []
> +               bad_atoms = []
> +               for x in ' '.join(myoptions.reinstall_atoms).split():
> +                       bad_atom = False
> +                       try:
> +                               atom = portage.dep.Atom(x,
> allow_wildcard=True)
> +                       except portage.exception.InvalidAtom:
> +                               try:
> +                                       atom = portage.dep.Atom("*/"+x,
> allow_wildcard=True)
> +                               except portage.exception.InvalidAtom:
> +                                       bad_atom = True
> +
> +                       if bad_atom:
> +                               bad_atoms.append(x)
> +                       else:
> +                               if atom.operator or atom.blocker or
> atom.use:
> +                                       bad_atoms.append(x)
> +                               else:
> +                                       reinstall_atoms.append(atom)
> +
> +               if bad_atoms and not silent:
> +                       parser.error("Invalid Atom(s) in --reinstall-atoms
> parameter: '%s' (only package names and slot atoms (with wildcards)
> allowed)\n" % \
> +                               (",".join(bad_atoms),))
> +
>        if myoptions.fail_clean in true_y:
>                myoptions.fail_clean = True
>
> @@ -1383,6 +1416,9 @@ def emerge_main():
>        if "--usepkgonly" in myopts:
>                myopts["--usepkg"] = True
>
> +       if "--reinstall-atoms" in myopts:
> +               myopts.setdefault("--deep", True)
> +
>        if "buildpkg" in settings.features or "--buildpkgonly" in myopts:
>                myopts["--buildpkg"] = True
>
>
>
>

[davidjames, 2011-03-10 18:45:34]

On 2011/03/10 18:09:39, anush wrote:
> Could --nousepkg take optional values that can be used to not usepkgs on
> them and if it is empty default to current --nousepkg ?

I asked Zac about this on IRC. He said he'd prefer to add new options rather
than overload the meaning of the existing option. So that's why I implemented it
this way. (I don't care either way.)

> Isn't --reinstall equal to --oneshot ?

Nope, they're unrelated. --oneshot indicates that you don't want to add a
package to the world file. --reinstall-atoms indicates that you want to
reinstall matching packages. It's similar to --selective=n, but it allows you to
specify explicitly what packages you want to reinstall unconditionally. In
Chrome OS we want to use this feature for cros_workon, but it's a useful feature
in general in case you want to reinstall / rebuild certain packages.

[anush, 2011-03-10 19:14:48]

Ok LGTM as long as it is ok with Zac.

On Thu, Mar 10, 2011 at 10:45 AM, <davidjames@chromium.org> wrote:

> On 2011/03/10 18:09:39, anush wrote:
>
>> Could --nousepkg take optional values that can be used to not usepkgs on
>> them and if it is empty default to current --nousepkg ?
>>
>
> I asked Zac about this on IRC. He said he'd prefer to add new options
> rather
> than overload the meaning of the existing option. So that's why I
> implemented it
> this way. (I don't care either way.)
>
>  Isn't --reinstall equal to --oneshot ?
>>
>
> Nope, they're unrelated. --oneshot indicates that you don't want to add a
> package to the world file. --reinstall-atoms indicates that you want to
> reinstall matching packages. It's similar to --selective=n, but it allows
> you to
> specify explicitly what packages you want to reinstall unconditionally. In
> Chrome OS we want to use this feature for cros_workon, but it's a useful
> feature
> in general in case you want to reinstall / rebuild certain packages.
>
>
> http://codereview.chromium.org/6577024/
>

[zmedico, 2011-04-27 22:09:52]

LGTM, except the patch accidentally removes these lines:

-	if myoptions.fail_clean in true_y:
-		myoptions.fail_clean = True

I've merged merged it upstream with those lines added back in:

http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=80b72a3e...