Merge lp:~kgoetz/merge-o-matic/mom-errorcatching into lp:merge-o-matic

[KarlGoetz]

[KarlGoetz (kgoetz)]

This branch houses a couple of changes to improve error catching. The scripts should all exit(1) without backtracing when they are run from a 'cold start'. I've tried to make sure these changes are split out from the other branches I'm working on, sorry if I've missed a few things.

[lp:~kgoetz/merge-o-matic/mom-errorcatching]

177. By KarlGoetz on 2010-02-27

Catch IOError. You'll see this if you can't lookup the hostname of your
mirror anymore.

=== modified file 'deb/controlfile.py'
--- deb/controlfile.py	2008-01-10 13:19:44 +0000
+++ deb/controlfile.py	2010-02-27 06:00:37 +0000
@@ -62,7 +62,11 @@
 
     def open(self, file, *args, **kwds):
         """Open and parse a control-file format file."""
-        f = open(file)
+        try:
+            f = open(file)
+        except IOError, e:
+            print e
+            exit(1)
         try:
             try:
                 self.parse(f, *args, **kwds)

=== modified file 'momlib.py'
--- momlib.py	2010-01-26 13:49:00 +0000
+++ momlib.py	2010-02-27 06:00:37 +0000
@@ -131,7 +131,14 @@
     """Ensure that the parent directories for path exist."""
     dirname = os.path.dirname(path)
     if not os.path.isdir(dirname):
-        os.makedirs(dirname)
+        try:
+            os.makedirs(dirname)
+        except IOError, e:
+            print e
+        except OSError, e:
+            print e
+        finally:
+            exit(1)
 
 def pathhash(path):
     """Return the path hash component for path."""

=== modified file 'publish-patches.py'
--- publish-patches.py	2008-01-10 13:19:44 +0000
+++ publish-patches.py	2010-02-27 06:00:37 +0000
@@ -40,7 +40,11 @@
 
     # Write to a new list
     list_filename = patch_list_file()
-    list_file = open(list_filename + ".new", "w")
+    try:
+        list_file = open(list_filename + ".new", "w")
+    except IOError, e:
+        print e
+        exit(1)
     try:
         # For each package in the distribution, check for a patch for the
         # current version; publish if it exists, clean up if not

=== modified file 'stats-graphs.py'
--- stats-graphs.py	2008-01-10 13:19:44 +0000
+++ stats-graphs.py	2010-02-27 06:00:37 +0000
@@ -128,7 +128,11 @@
     stats = {}
 
     stats_file = "%s/stats.txt" % ROOT
-    stf = open(stats_file, "r");
+    try:
+        stf = open(stats_file, "r");
+    except IOError, e:
+        print e
+        exit(1)
     try:
         for line in stf:
             (date, time, component, info) = line.strip().split(" ", 3)

=== modified file 'syndicate.py'
--- syndicate.py	2009-05-29 07:14:42 +0000
+++ syndicate.py	2010-02-27 06:00:37 +0000
@@ -372,7 +372,12 @@
     """Read the subscriptions file."""
     subscriptions = []
 
-    f = open("%s/subscriptions.txt" % ROOT)
+    try:
+        f = open("%s/subscriptions.txt" % ROOT)
+    except IOError, e:
+        print e
+        exit(1)
+
     try:
         fcntl.flock(f.fileno(), fcntl.LOCK_SH)
 

=== modified file 'update-pool.py'
--- update-pool.py	2009-05-29 07:20:19 +0000
+++ update-pool.py	2010-02-27 06:00:37 +0000
@@ -50,7 +50,11 @@
                     if options.package is not None \
                            and source["Package"] not in options.package:
                         continue
-                    update_pool(distro, source)
+                    try:
+                        update_pool(distro, source)
+                    except IOError, e:
+                        print e
+                        exit(1)
 
 
 def sources_url(distro, dist, component):

=== modified file 'update-sources.py'
--- update-sources.py	2009-05-29 07:23:15 +0000
+++ update-sources.py	2010-02-27 06:00:37 +0000
@@ -33,7 +33,8 @@
     for distro in distros:
         try:
             hparts = os.listdir("%s/pool/%s" % (ROOT, distro))
-        except OSError:
+        except OSError, e:
+            print e
             continue
         for hpart in hparts:
             for package in os.listdir("%s/pool/%s/%s" % (ROOT, distro, hpart)):