[mirrorbrain-commits] [opensuse-svn] r6662 - in trunk/tools/download-redirector-v2/mirrordoctor: . mb

Author: poeml
Date: 2009-03-03 01:38:15 -0700 (Tue, 03 Mar 2009)
New Revision: 6662

Modified:
   trunk/tools/download-redirector-v2/mirrordoctor/mb/mirrorlists.py
   trunk/tools/download-redirector-v2/mirrordoctor/mirrordoctor.py
Log:
mb tool: 
- fix a namespace problem (?) with module importing which I don't really
  understand.  It must have turned up after r6569, I don't see a change that
  could possibly be related. Anyway, a simple module level import makes it go
  away.
- remove an unneeded import (which had no effect on the above)


Modified: trunk/tools/download-redirector-v2/mirrordoctor/mb/mirrorlists.py
===================================================================
--- trunk/tools/download-redirector-v2/mirrordoctor/mb/mirrorlists.py	2009-03-02 21:15:44 UTC (rev 6661)
+++ trunk/tools/download-redirector-v2/mirrordoctor/mb/mirrorlists.py	2009-03-03 08:38:15 UTC (rev 6662)
@@ -2,6 +2,7 @@
 
 import sys, os, os.path
 import mb
+import mb.util
 import mb.files
 import tempfile
 import cgi
@@ -72,7 +73,6 @@
 
     if opts.inline_images_from:
         import os
-        import mb.util
         if not os.path.exists(opts.inline_images_from):
             sys.exit('path %r does not exist' % opts.inline_images_from)
 

Modified: trunk/tools/download-redirector-v2/mirrordoctor/mirrordoctor.py
===================================================================
--- trunk/tools/download-redirector-v2/mirrordoctor/mirrordoctor.py	2009-03-02 21:15:44 UTC (rev 6661)
+++ trunk/tools/download-redirector-v2/mirrordoctor/mirrordoctor.py	2009-03-03 08:38:15 UTC (rev 6662)
@@ -194,7 +194,6 @@
             mirrordoctor list [IDENTIFIER]
         ${cmd_option_list}
         """
-        from sqlobject.sqlbuilder import LIKE
         if opts.country:
             mirrors = self.conn.Server.select("""country LIKE '%%%s%%'""" % opts.country)
         elif opts.region:
@@ -791,6 +790,7 @@
         
 
         if args:
+            import mb.conn
             mirrors = mb.conn.servers_match(self.conn.Server, args[0])
         else:
             from sqlobject.sqlbuilder import AND, NOT

_______________________________________________
Opensuse-svn mailing list
Opensuse-svn_at_forge.novell.com
http://forge.novell.com/mailman/listinfo/opensuse-svn


_______________________________________________
mirrorbrain-commits mailing list

Note: To remove yourself from this list, send a mail with the content
 	unsubscribe
to the address mirrorbrain-commits-request_at_mirrorbrain.org