Merge branch 'stable'

[stgit] / stgit / utils.py

diff --git a/stgit/utils.py b/stgit/utils.py
index b75c3b4ff0cc07a37cc2c2f7a062722b1f4be07e..cd523826153ba336b7c1b63056a3cae461d02fb8 100644 (file)
--- a/stgit/utils.py
+++ b/stgit/utils.py
@@ -327,6 +327,7 @@ STGIT_SUCCESS = 0        # everything's OK
 STGIT_GENERAL_ERROR = 1  # seems to be non-command-specific error
 STGIT_COMMAND_ERROR = 2  # seems to be a command that failed
 STGIT_CONFLICT = 3       # merge conflict, otherwise OK
 STGIT_GENERAL_ERROR = 1  # seems to be non-command-specific error
 STGIT_COMMAND_ERROR = 2  # seems to be a command that failed
 STGIT_CONFLICT = 3       # merge conflict, otherwise OK

+STGIT_BUG_ERROR = 4      # a bug in StGit

 
 def strip_leading(prefix, s):
     """Strip leading prefix from a string. Blow up if the prefix isn't
 
 def strip_leading(prefix, s):
     """Strip leading prefix from a string. Blow up if the prefix isn't