From d1bad698cefd84695ab0bc5c092ffb0a0abca2e2 Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@mit.edu>
Date: Tue, 13 Jan 2015 13:15:10 -0800
Subject: [PATCH] Fix package downloading on posix

---
 tools/tropohouse.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/tropohouse.js b/tools/tropohouse.js
index d1fb4d1661..678f5cf107 100644
--- a/tools/tropohouse.js
+++ b/tools/tropohouse.js
@@ -235,12 +235,12 @@ _.extend(exports.Tropohouse.prototype, {
       // Note: wipeAllPackages depends on this filename structure, as does the
       // part above which readlinks.
       var combinedDirectory = self.packagePath(
-        packageName, newPackageLinkTarget);
+        packageName, isopack.version);
 
       var newPackageLinkTarget = '.' + isopack.version + '.' +
         utils.randomToken() + '++' + isopack.buildArchitectures();
 
-      isopack.saveToPath(combinedDirectory);
+      isopack.saveToPath(newPackageLinkTarget);
 
       files.symlinkOverSync(newPackageLinkTarget,
         self.packagePath(packageName, isopack.version));
@@ -324,7 +324,7 @@ _.extend(exports.Tropohouse.prototype, {
         } else {
           var packageLinkTarget = null;
           try {
-            packageLinkTarget = files.readFile(packagePath);
+            packageLinkTarget = files.readlink(packagePath);
           } catch (e) {
             // Complain about anything other than "we don't have it at all". This
             // includes "not a symlink": The main reason this would not be a symlink