From: W. Trevor King <wking@drexel.edu>
Date: Mon, 25 Jan 2010 12:31:57 +0000 (-0500)
Subject: Don't print 'Multiple paths' message on cache regen
X-Git-Tag: 1.0.0~59^2~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a87dde3eab86554f0ff70fb53d142ca7bca28b55;p=be.git

Don't print 'Multiple paths' message on cache regen
---

diff --git a/libbe/storage/vcs/base.py b/libbe/storage/vcs/base.py
index 7068e46..2269424 100644
--- a/libbe/storage/vcs/base.py
+++ b/libbe/storage/vcs/base.py
@@ -182,7 +182,7 @@ class CachedPathID (object):
         self._cache_path = os.path.join(
             self._root, self._spacer_dirs[0], 'id-cache')
 
-    def init(self):
+    def init(self, verbose=True):
         """
         Create cache file for an existing .be directory.
         File if multiple lines of the form:
@@ -197,7 +197,7 @@ class CachedPathID (object):
                 id = self.id(dirpath)
                 relpath = dirpath[len(self._root)+1:]
                 if id.count('/') == 0:
-                    if id in self._cache:
+                    if verbose == True and id in self._cache:
                         print >> sys.stderr, 'Multiple paths for %s: \n  %s\n  %s' % (id, self._cache[id], relpath)
                     self._cache[id] = relpath
             except InvalidPath:
@@ -240,7 +240,7 @@ class CachedPathID (object):
             extra = fields[1:]
         if uuid not in self._cache:
             self.disconnect()
-            self.init()
+            self.init(verbose=False)
             self.connect()
             if uuid not in self._cache:
                 raise InvalidID(uuid)