Implement return codes consistently.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10132 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/lyx2lyx/ChangeLog b/lib/lyx2lyx/ChangeLog
index dd974627cddec7cea16fc3adb09a44873dd2ef60..ee07c0f5edaadde4609246ed1f69c2a24b0cda9c 100644 (file)
--- a/lib/lyx2lyx/ChangeLog
+++ b/lib/lyx2lyx/ChangeLog
@@ -1,3 +1,13 @@
+2005-07-05  José Matos  <jamatos@lyx.org>
+
+       * LyX.py (LyX_Base):
+       * LyX.py (error):
+       * LyX.py (convert):
+       * lyx2lyx: Implement return codes consistently:
+       0 - OK.
+       1 - Irrecoverable error.
+       2 - Recovered from error(s).
+
 2005-07-05  José Matos  <jamatos@lyx.org>
 
        * LyX.py (LyX_Base):

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 4b5dadcf0d5a96817f81fb495ff41e67e8108565..33edd48f0cdaa3d00b88fe34ca9e8953bb99d47a 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -112,6 +112,7 @@ class LyX_Base:
         self.textclass = "article"
         self.header = []
         self.body = []
+        self.status = 0
 
 
     def warning(self, message, debug_level= default_debug_level):
@@ -121,10 +122,13 @@ class LyX_Base:
 
 
     def error(self, message):
-        " Emits a warning and exist incondicionally."
+        " Emits a warning and exits if not in try_hard mode."
         self.warning(message)
-        self.warning("Quiting.")
-        sys.exit(1)
+        if not self.try_hard:
+            self.warning("Quiting.")
+            sys.exit(1)
+
+        self.status = 2
 
 
     def read(self):
@@ -290,6 +294,7 @@ class LyX_Base:
                                      default_debug_level)
                         if not self.try_hard:
                             raise
+                        self.status = 2
                     else:
                         self.warning("%lf: Elapsed time on %s"  % (time.time() - init_t, str(conv)),
                                      default_debug_level + 1)

diff --git a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx
index 5c63e64ba209df515c5506642a3c696140e8281c..ce0e45278d8a9ce536e24d399658763573082e50 100755 (executable)
--- a/lib/lyx2lyx/lyx2lyx
+++ b/lib/lyx2lyx/lyx2lyx
@@ -84,5 +84,8 @@ def main(argv):
     file.convert()
     file.write()
 
+    return file.status
+
+
 if __name__ == "__main__":
-    main(sys.argv)
+    sys.exit(main(sys.argv))