[gentoo-commits] proj/portage:master commit in: pym/_emerge/

[Brian Dolbec]

commit:     bf62f8954f087b4f2e1158eb7c62b7a03d5dd9a1
Author:     James Broadhead <jbroadhead <AT> twitter <DOT> com>
AuthorDate: Wed Oct  7 23:58:46 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Oct  7 23:58:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=bf62f895

_emerge/Scheduler.py: Add FAILURE enum

 pym/_emerge/Scheduler.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 968af6c..20a4e85 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -65,6 +65,10 @@ from _emerge.SequentialTaskQueue import SequentialTaskQueue
 if sys.hexversion >= 0x3000000:
        basestring = str
 
+# enums
+FAILURE = 1
+
+
 class Scheduler(PollScheduler):
 
        # max time between loadavg checks (milliseconds)
@@ -641,7 +645,7 @@ class Scheduler(PollScheduler):
                                writemsg_level(
                                        "!!! Unable to generate manifest for 
'%s'.\n" \
                                        % x.cpv, level=logging.ERROR, 
noiselevel=-1)
-                               return 1
+                               return FAILURE
 
                return os.EX_OK
 
@@ -673,7 +677,7 @@ class Scheduler(PollScheduler):
                                out = portage.output.EOutput()
                                for line in textwrap.wrap(msg, 70):
                                        out.eerror(line)
-                               return 1
+                               return FAILURE
 
                return os.EX_OK
 
@@ -719,7 +723,7 @@ class Scheduler(PollScheduler):
                                failures |= 1
 
                if failures:
-                       return 1
+                       return FAILURE
                return os.EX_OK
 
        def _add_prefetchers(self):
@@ -934,7 +938,7 @@ class Scheduler(PollScheduler):
                                build_dir.unlock()
 
                if failures:
-                       return 1
+                       return FAILURE
                return os.EX_OK
 
        def merge(self):
@@ -949,7 +953,7 @@ class Scheduler(PollScheduler):
                try:
                        self._background = self._background_mode()
                except self._unknown_internal_error:
-                       return 1
+                       return FAILURE
 
                rval = self._handle_self_update()
                if rval != os.EX_OK:
@@ -971,7 +975,7 @@ class Scheduler(PollScheduler):
                                out = portage.output.EOutput()
                                for l in msg:
                                        out.eerror(l)
-                               return 1
+                               return FAILURE
 
                        if self._background:
                                root_config.settings.unlock()
@@ -1180,7 +1184,7 @@ class Scheduler(PollScheduler):
                        printer.eerror("")
 
                if self._failed_pkgs_all:
-                       return 1
+                       return FAILURE
                return os.EX_OK
 
        def _elog_listener(self, mysettings, key, logentries, fulltext):