From aa52136c8ef9cd269a36aafa2c366e7cd980e0f3 Mon Sep 17 00:00:00 2001
From: Emily Stark <emily@meteor.com>
Date: Thu, 16 Oct 2014 15:08:03 -0700
Subject: [PATCH] Fix 'api.versionsFrom' in skeleton packages created from
 releases

---
 tools/commands.js            |  4 ++--
 tools/tests/package-tests.js | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/tools/commands.js b/tools/commands.js
index 23319ae492..fb111fdf98 100644
--- a/tools/commands.js
+++ b/tools/commands.js
@@ -425,10 +425,10 @@ main.registerCommand({
         var rel = commandsPackages.doOrDie(function () {
           return catalog.official.getDefaultReleaseVersion();
         });
-        var relString = rel.version;
+        relString = rel.version;
       } else {
         xn = xn.replace(/~cc~/g, "");
-        relString = release.current.version;
+        relString = release.current.getReleaseVersion();
       }
 
       // If we are not in checkout, write the current release here.
diff --git a/tools/tests/package-tests.js b/tools/tests/package-tests.js
index 8151d3a49e..5c337c2748 100644
--- a/tools/tests/package-tests.js
+++ b/tools/tests/package-tests.js
@@ -904,3 +904,19 @@ selftest.define("add package with no builds", ["net", "test-package-server"], fu
                " has no compatible build");
   run.expectExit(1);
 });
+
+selftest.define("package skeleton creates correct versionsFrom", function () {
+  var s = new Sandbox({ warehouse: { v1: { recommended: true } } });
+  var fullPackageName = "test:" + utils.randomToken();
+
+  var run = s.run("create", "--package", fullPackageName);
+  run.waitSecs(15);
+  run.expectExit(0);
+
+  s.cd(fullPackageName);
+  var packageJs = s.read("package.js");
+  if (! packageJs.match(/api.versionsFrom\('v1'\);/)) {
+    selftest.fail("package.js missing correct 'api.versionsFrom':\n" +
+                  packageJs);
+  }
+});