From a9c740165c842f966e50110a4af8a2dddfdcec7d Mon Sep 17 00:00:00 2001 From: David Glasser Date: Thu, 21 Aug 2014 16:52:02 -0700 Subject: [PATCH] stop uniload packages from using versionsFrom They don't need to and it won't work. --- tools/package-source.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/package-source.js b/tools/package-source.js index 20aedd888a..0519e324ca 100644 --- a/tools/package-source.js +++ b/tools/package-source.js @@ -958,6 +958,18 @@ _.extend(PackageSource.prototype, { return; } + // Uniloaded packages really ought to be in the core release, by + // definition, so saying that they should use versions from another + // release doesn't make sense. Moreover, if we're running from a + // checkout, we build packages for catalog.uniload before we + // initialize catalog.official, so we wouldn't actually be able to + // interpret the release name anyway. + if (self.catalog === catalog.uniload) { + buildmessage.error("uniloaded packages may not use versionsFrom"); + // recover by ignoring + return; + } + // If you don't specify a track, use our default. if (release.indexOf('@') === -1) { release = catalog.DEFAULT_TRACK + "@" + release;