Fix a bug in userFilename that left us with a directory in ./~/. Add a facility for controller-readable log messages with --controller-log-format

git-svn-id: file:///home/or/svnrepo/updater/trunk@17367 55e972cd-5a19-0410-ae62-a4d7a52db4cd

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/thandy/repository.py b/lib/thandy/repository.py
index a6df1bb..2dea1c4 100644
--- a/lib/thandy/repository.py
+++ b/lib/thandy/repository.py
@@ -483,6 +483,8 @@ class LocalRepository:
                         if h.isInstalled():
                             alreadyInstalled[h.getRelativePath()] = h
 
+            pkg_rp = pfile.getRelativePath()
+
             for f in package['files']:
                 rp, h = f[:2]
                 if alreadyInstalled.has_key(rp):
@@ -505,7 +507,7 @@ class LocalRepository:
                     need.add(rp)
                 else:
                     if allHandles.has_key(rp):
-                        installableDict[rp] = allHandles[rp]
+                        installableDict.setdefault(pkg_rp, {})[rp] = allHandles[rp]
 
         # Okay; these are the files we need.
         return need