Make error codes consistent

3 files changed, 30 insertions, 30 deletions

diff --git a/bin/dnsget b/bin/dnsget
index 74b54d6..4e811c4 100755
--- a/bin/dnsget
+++ b/bin/dnsget
@@ -541,17 +541,17 @@ def main():
                     analysis_str = open(opts['-r']).read()
                 except IOError, e:
                     logger.error('%s: "%s"' % (e.strerror, opts['-r']))
-                    sys.exit(2)
+                    sys.exit(3)
             try:
                 analysis_structured = json.loads(analysis_str)
             except ValueError:
                 logger.error('There was an error parsing the json input: "%s"' % opts['-r'])
-                sys.exit(2)
+                sys.exit(3)
 
             # check version
             if '_meta._dnsviz.' in analysis_structured and 'version' in analysis_structured['_meta._dnsviz.'] and analysis_structured['_meta._dnsviz.']['version'] > DNS_RAW_VERSION:
                 logger.error('Unsupported version: "%s"' % analysis_structured['_meta._dnsviz.']['version'])
-                sys.exit(2)
+                sys.exit(3)
 
         else:
             # get client addresses where they are needed
@@ -584,7 +584,7 @@ def main():
                 f = codecs.open(opts['-f'], 'r', 'utf-8')
             except IOError, e:
                 logger.error('%s: "%s"' % (e.strerror, opts['-f']))
-                sys.exit(2)
+                sys.exit(3)
             for line in f:
                 name = line.strip()
                 try:
@@ -602,7 +602,7 @@ def main():
                     args = analysis_structured['_meta._dnsviz.']['names']
                 except KeyError:
                     logger.error('No names found in json input!')
-                    sys.exit(2)
+                    sys.exit(3)
             for name in args:
                 try:
                     name = dns.name.from_text(name)
@@ -625,7 +625,7 @@ def main():
                 fh = open(opts['-o'], 'w')
             except IOError, e:
                 logger.error('%s: "%s"' % (e.strerror, opts['-o']))
-                sys.exit(2)
+                sys.exit(3)
 
         def _flush(name_obj):
             d = collections.OrderedDict()
@@ -663,7 +663,7 @@ def main():
         name_objs = filter(lambda x: x is not None, name_objs)
 
         if not name_objs:
-            sys.exit(2)
+            sys.exit(4)
 
         d = collections.OrderedDict()
         for name_obj in name_objs:
diff --git a/bin/dnsgrok b/bin/dnsgrok
index 0348065..11b6216 100755
--- a/bin/dnsgrok
+++ b/bin/dnsgrok
@@ -79,13 +79,13 @@ def test_pygraphviz():
             minor = int(re.sub(r'(\d+)[^\d].*', r'\1', minor))
             if (major, minor) < (1,1):
                 sys.stderr.write('''pygraphviz version >= 1.1 is required, but version %s is installed.\n''' % release.version)
-                sys.exit(3)
+                sys.exit(2)
         except ValueError:
             sys.stderr.write('''pygraphviz version >= 1.1 is required, but version %s is installed.\n''' % release.version)
-            sys.exit(3)
+            sys.exit(2)
     except ImportError:
         sys.stderr.write('''pygraphviz is required, but not installed.\n''')
-        sys.exit(3)
+        sys.exit(2)
 
 def main():
     try:
@@ -132,17 +132,17 @@ def main():
                 analysis_str = open(opts['-r']).read()
             except IOError, e:
                 logger.error('%s: "%s"' % (e.strerror, opts['-r']))
-                sys.exit(2)
+                sys.exit(3)
         try:
             analysis_structured = json.loads(analysis_str)
         except ValueError:
             logger.error('There was an error parsing the json input: "%s"' % opts.get('-r', '-'))
-            sys.exit(2)
+            sys.exit(3)
 
         # check version
         if '_meta._dnsviz.' in analysis_structured and 'version' in analysis_structured['_meta._dnsviz.'] and analysis_structured['_meta._dnsviz.']['version'] > DNS_RAW_VERSION:
             logger.error('Unsupported version: "%s"' % analysis_structured['_meta._dnsviz.']['version'])
-            sys.exit(2)
+            sys.exit(3)
 
         names = []
         if '-f' in opts:
@@ -150,7 +150,7 @@ def main():
                 f = codecs.open(opts['-f'], 'r', 'utf-8')
             except IOError, e:
                 logger.error('%s: "%s"' % (e.strerror, opts['-f']))
-                sys.exit(2)
+                sys.exit(3)
             for line in f:
                 name = line.strip()
                 try:
@@ -168,7 +168,7 @@ def main():
                     args = analysis_structured['_meta._dnsviz.']['names']
                 except KeyError:
                     logger.error('No names found in json input!')
-                    sys.exit(2)
+                    sys.exit(3)
             for name in args:
                 try:
                     name = dns.name.from_text(name)
@@ -189,19 +189,19 @@ def main():
                 fh = open(opts['-o'], 'w')
             except IOError, e:
                 logger.error('%s: "%s"' % (e.strerror, opts['-o']))
-                sys.exit(2)
+                sys.exit(3)
 
         if '-t' in opts:
             try:
                 tk_str = open(opts['-t']).read()
             except IOError, e:
                 logger.error('%s: "%s"' % (e.strerror, opts['-t']))
-                sys.exit(2)
+                sys.exit(3)
             try:
                 trusted_keys = get_trusted_keys(tk_str)
             except dns.exception.DNSException:
                 logger.error('There was an error parsing the trusted keys file: "%s"' % opts['-t'])
-                sys.exit(2)
+                sys.exit(3)
             # check that pygraphviz is installed
             test_pygraphviz()
         else:
@@ -216,7 +216,7 @@ def main():
             name_objs.append(OfflineDomainNameAnalysis.deserialize(name, analysis_structured))
 
         if not name_objs:
-            sys.exit(2)
+            sys.exit(4)
 
         d = collections.OrderedDict()
         for name_obj in name_objs:
diff --git a/bin/dnsviz b/bin/dnsviz
index 6c1889e..8aacacf 100755
--- a/bin/dnsviz
+++ b/bin/dnsviz
@@ -297,13 +297,13 @@ def test_pygraphviz():
             minor = int(re.sub(r'(\d+)[^\d].*', r'\1', minor))
             if (major, minor) < (1,1):
                 sys.stderr.write('''pygraphviz version >= 1.1 is required, but version %s is installed.\n''' % release.version)
-                sys.exit(3)
+                sys.exit(2)
         except ValueError:
             sys.stderr.write('''pygraphviz version >= 1.1 is required, but version %s is installed.\n''' % release.version)
-            sys.exit(3)
+            sys.exit(2)
     except ImportError:
         sys.stderr.write('''pygraphviz is required, but not installed.\n''')
-        sys.exit(3)
+        sys.exit(2)
 
 def main():
     try:
@@ -365,17 +365,17 @@ def main():
                 analysis_str = open(opts['-r']).read()
             except IOError, e:
                 logger.error('%s: "%s"' % (e.strerror, opts['-r']))
-                sys.exit(2)
+                sys.exit(3)
         try:
             analysis_structured = json.loads(analysis_str)
         except ValueError:
             logger.error('There was an error parsing the json input: "%s"' % opts.get('-r', '-'))
-            sys.exit(2)
+            sys.exit(3)
 
         # check version
         if '_meta._dnsviz.' in analysis_structured and 'version' in analysis_structured['_meta._dnsviz.'] and analysis_structured['_meta._dnsviz.']['version'] > DNS_RAW_VERSION:
             logger.error('Unsupported version: "%s"' % analysis_structured['_meta._dnsviz.']['version'])
-            sys.exit(2)
+            sys.exit(3)
 
         names = []
         if '-f' in opts:
@@ -383,7 +383,7 @@ def main():
                 f = codecs.open(opts['-f'], 'r', 'utf-8')
             except IOError, e:
                 logger.error('%s: "%s"' % (e.strerror, opts['-f']))
-                sys.exit(2)
+                sys.exit(3)
             for line in f:
                 name = line.strip()
                 try:
@@ -401,7 +401,7 @@ def main():
                     args = analysis_structured['_meta._dnsviz.']['names']
                 except KeyError:
                     logger.error('No names found in json input!')
-                    sys.exit(2)
+                    sys.exit(3)
             for name in args:
                 try:
                     name = dns.name.from_text(name)
@@ -415,12 +415,12 @@ def main():
                 tk_str = open(opts['-t']).read()
             except IOError, e:
                 logger.error('%s: "%s"' % (e.strerror, opts['-t']))
-                sys.exit(2)
+                sys.exit(3)
             try:
                 trusted_keys = get_trusted_keys(tk_str)
             except dns.exception.DNSException:
                 logger.error('There was an error parsing the trusted keys file: "%s"' % opts['-t'])
-                sys.exit(2)
+                sys.exit(3)
         else:
             trusted_keys = ()
 
@@ -433,7 +433,7 @@ def main():
             name_objs.append(OfflineDomainNameAnalysis.deserialize(name, analysis_structured))
 
         if not name_objs:
-            sys.exit(2)
+            sys.exit(4)
 
         G = DNSAuthGraph()
         for name_obj in name_objs: