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

pym/_emerge/main.py

 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from __future__ import print_function
 
 import logging
 import signal
 import stat
 import sys
 import textwrap
@@ skipping 493 matching lines @@
                 else:
                         new_args.append(opt_arg)
 
                 if saved_opts is not None:
                         # Recycle these on arg_stack since they
                         # might contain another match.
                         arg_stack.append("-" + saved_opts)
 
         return new_args
 
+def _find_bad_atoms(atoms):
+        bad_atoms = []
+        for x in ' '.join(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 or atom.operator or atom.blocker or atom.use:
+                        bad_atoms.append(x)
+        return bad_atoms
+
+
 def parse_opts(tmpcmdline, silent=False):
         myaction=None
         myopts = {}
         myfiles=[]
 
         global options, shortmapping
 
         actions = frozenset([
                 "clean", "config", "depclean", "help",
                 "info", "list-sets", "metadata",
@@ skipping 109 matching lines @@
                         "help":"include unnecessary build time dependencies",
                         "type":"choice",
                         "choices":("y", "n")
                 },
                 "--reinstall": {
                         "help":"specify conditions to trigger package reinstallation",
                         "type":"choice",
                         "choices":["changed-use"]
                 },
 
+                "--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",
+                },
+
                 "--binpkg-respect-use": {
                         "help"    : "discard binary packages if their use flags \
                                 don't match the current configuration",
                         "type"    : "choice",
                         "choices" : true_y_or_n
                 },
 
                 "--getbinpkg": {
                         "shortopt" : "-g",
                         "help"     : "fetch binary packages",
                         "type"     : "choice",
                         "choices"  : true_y_or_n
                 },
 
                 "--getbinpkgonly": {
                         "shortopt" : "-G",
                         "help"     : "fetch binary packages only",
                         "type"     : "choice",
                         "choices"  : true_y_or_n
                 },
 
+                "--nousepkg-atoms": {
+                        "help"   :"A space separated list of package names or slot atoms. " + \
+                                "Emerge will ignore matching binary packages. ",
+
+                        "action" : "append",
+                },
+
                 "--package-moves": {
                         "help"     : "perform package moves when necessary",
                         "type"     : "choice",
                         "choices"  : true_y_or_n
                 },
 
                 "--rebuilt-binaries": {
                         "help"     : "replace installed packages with binary " + \
                                      "packages that have been rebuilt",
                         "type"     : "choice",
@@ skipping 30 matching lines @@
                         "type"    : "choice",
                         "choices" : true_y_or_n
                 },
 
                 "--use-ebuild-visibility": {
                         "help"     : "use unbuilt ebuild metadata for visibility checks on built packages",
                         "type"     : "choice",
                         "choices"  : true_y_or_n
                 },
 
+                "--useoldpkg-atoms": {
+                        "help"   :"A space separated list of package names or slot atoms. " + \
+                                "Emerge will prefer matching binary packages over newer unbuilt packages. ",
+
+                        "action" : "append",
+                },
+
                 "--usepkg": {
                         "shortopt" : "-k",
                         "help"     : "use binary packages",
                         "type"     : "choice",
                         "choices"  : true_y_or_n
                 },
 
                 "--usepkgonly": {
                         "shortopt" : "-K",
                         "help"     : "use only binary packages",
@@ skipping 63 matching lines @@
         if myoptions.complete_graph in true_y:
                 myoptions.complete_graph = True
         else:
                 myoptions.complete_graph = None
 
         if _ENABLE_DYN_LINK_MAP:
                 if myoptions.depclean_lib_check in true_y:
                         myoptions.depclean_lib_check = True
 
         if myoptions.exclude:
-                exclude = []
-                bad_atoms = []
-                for x in ' '.join(myoptions.exclude).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:
-                                        exclude.append(atom)
-
+                bad_atoms = _find_bad_atoms(myoptions.exclude)
                 if bad_atoms and not silent:
                         parser.error("Invalid Atom(s) in --exclude 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
+        if myoptions.reinstall_atoms:
+                bad_atoms = _find_bad_atoms(myoptions.reinstall_atoms)
+                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.nousepkg_atoms:
+                bad_atoms = _find_bad_atoms(myoptions.nousepkg_atoms)
+                if bad_atoms and not silent:
+                        parser.error("Invalid Atom(s) in --nousepkg-atoms parameter: '%s' (only package names and slot atoms (with wildcards) allowed)\n" % \
+                                (",".join(bad_atoms),))
+
+        if myoptions.useoldpkg_atoms:
+                bad_atoms = _find_bad_atoms(myoptions.useoldpkg_atoms)
+                if bad_atoms and not silent:
+                        parser.error("Invalid Atom(s) in --useoldpkg-atoms parameter: '%s' (only package names and slot atoms (with wildcards) allowed)\n" % \
+                                (",".join(bad_atoms),))
 
         if myoptions.getbinpkg in true_y:
                 myoptions.getbinpkg = True
         else:
                 myoptions.getbinpkg = None
 
         if myoptions.getbinpkgonly in true_y:
                 myoptions.getbinpkgonly = True
         else:
                 myoptions.getbinpkgonly = None
@@ skipping 863 matching lines @@
                         return 1
 
                 if "--pretend" not in myopts:
                         display_news_notification(root_config, myopts)
                 retval = action_build(settings, trees, mtimedb,
                         myopts, myaction, myfiles, spinner)
                 root_config = trees[settings["ROOT"]]["root_config"]
                 post_emerge(root_config, myopts, mtimedb, retval)
 
                 return retval