mail-merge: import rtkit from ~adehnert if needed

If rtkit can't be found on the normal path, add my locker to sys.path and try
again.

diff --git a/mail-merge b/mail-merge
index 10ab6457a287eeb55ebb73e505f5745dd0a12c15..4e5f3531a96de2b042389094732df90a967d3afe 100755 (executable)
--- a/mail-merge
+++ b/mail-merge
@@ -10,6 +10,7 @@ import sys
 
 
 sender_header = 'mail-merge-sender@mit.edu'
+rtkit_path = '/afs/athena.mit.edu/user/a/d/adehnert/arch/common/lib/python/'
 smtp = None
 
 def dictize_line(header, line,):
@@ -61,7 +62,13 @@ def msg_filter_factory(opts):
     if not opts.rt_queue:
         return nop_msg_filter
 
-    import rtkit.tracker, rtkit.authenticators, rtkit.errors
+    try:
+        import rtkit.tracker, rtkit.authenticators, rtkit.errors
+    except ImportError:
+        print "Note: using rtkit from %s" % (rtkit_path, )
+        sys.path.append(rtkit_path)
+        import rtkit.tracker, rtkit.authenticators, rtkit.errors
+
     cookie = rtkit.authenticators.CookieAuthenticator
     resource = rtkit.resource.RTResource.from_rtrc(cookie)
     parser = email.parser.Parser()