[mirrorbrain-commits] [opensuse-svn] r6563 - trunk/tools/download-redirector-v2/mirrordoctor

Author: poeml
Date: 2009-02-24 11:37:56 -0700 (Tue, 24 Feb 2009)
New Revision: 6563

Modified:
   trunk/tools/download-redirector-v2/mirrordoctor/mirrordoctor.py
Log:
mb mirrorlist:
- ensure that the new private mirror type doesn't end up on the generated
  public mirror list


Modified: trunk/tools/download-redirector-v2/mirrordoctor/mirrordoctor.py
===================================================================
--- trunk/tools/download-redirector-v2/mirrordoctor/mirrordoctor.py	2009-02-24 16:58:56 UTC (rev 6562)
+++ trunk/tools/download-redirector-v2/mirrordoctor/mirrordoctor.py	2009-02-24 18:37:56 UTC (rev 6563)
@@ -755,7 +755,8 @@
     @cmdln.option('-F', '--filter', metavar='REGEX',
                   help='only markers matching this regular expression are used')
     @cmdln.option('-l', '--list-markers', action='store_true',
-                  help='just show the defined marker files.')
+                  help='just show the defined marker files. (See "mb markers" '
+                        'which also allows editing markers.)')
     def do_mirrorlist(self, subcmd, opts, *args):
         """${cmd_name}: generate a mirror list
 
@@ -788,12 +789,13 @@
         if args:
             mirrors = mb.conn.servers_match(self.conn.Server, args[0])
         else:
-            from sqlobject.sqlbuilder import AND
+            from sqlobject.sqlbuilder import AND, NOT
             mirrors = self.conn.Server.select(AND(self.conn.Server.q.enabled,
+                                                  NOT(self.conn.Server.q.prefixOnly),
+                                                  NOT(self.conn.Server.q.asOnly),
                                                   self.conn.Server.q.country != '**'),
                                               orderBy=['region', 'country', '-score'])
 
-
         import mb.mirrorlists
 
         if opts.format not in mb.mirrorlists.supported:

_______________________________________________
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