[or-cvs] [thandy/master] Allow tracking all bundles in the repository with thandy-client

[Nick Mathewson]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Tue, 11 Aug 2009 11:34:33 +0200
Subject: Allow tracking all bundles in the repository with thandy-client
Commit: ebbcff7f7a99eec8075d67cba18e349562507513

thandy-client now allows passing ** instead of a path for bundles.
This is treated as a special case, other wild card or regular
expression matching is not included.
---
 lib/thandy/ClientCLI.py  |    1 +
 lib/thandy/formats.py    |    3 +++
 lib/thandy/repository.py |    3 +++
 3 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/lib/thandy/ClientCLI.py b/lib/thandy/ClientCLI.py
index 05d2cd8..73c96df 100644
--- a/lib/thandy/ClientCLI.py
+++ b/lib/thandy/ClientCLI.py
@@ -219,6 +219,7 @@ def usage():
     print "         [--no-packagesys] [--install] [--socks-port=port]"
     print "         [--debug|--info|--warn] [--force-check]"
     print "         [--controller-log-format]"
+    print "         bundle1, bundle2, ..."
     print "  json2xml file"
     sys.exit(1)
 
diff --git a/lib/thandy/formats.py b/lib/thandy/formats.py
index f59995a..0eb501b 100644
--- a/lib/thandy/formats.py
+++ b/lib/thandy/formats.py
@@ -637,6 +637,9 @@ class TimestampFile:
     def getBundleInfo(self, name):
         return self._bundleInfo[name]
 
+    def getBundleInfos(self):
+        return self._bundleInfo
+
 def readConfigFile(fname, needKeys=(), optKeys=(), preload={}):
     parsed = preload.copy()
     result = {}
diff --git a/lib/thandy/repository.py b/lib/thandy/repository.py
index 6d1ece3..af20904 100644
--- a/lib/thandy/repository.py
+++ b/lib/thandy/repository.py
@@ -394,6 +394,9 @@ class LocalRepository:
         # Okay; that's it for the metadata.  Do we have the right
         # bundles?
         bundles = {}
+        if len(trackingBundles) == 1 and trackingBundles[0] == "**":
+            trackingBundles = ts.getBundleInfos()
+
         for b in trackingBundles:
             try:
                 binfo = ts.getBundleInfo(b)
-- 
1.5.6.5