From e42632b4e55cd66311277f2f14899acb469299db Mon Sep 17 00:00:00 2001 From: ekatek Date: Fri, 7 Mar 2014 13:11:00 -0800 Subject: [PATCH] fixing version in publishing --- packages/package-version-parser/package-version-parser.js | 4 ++-- tools/commands.js | 8 ++++++-- tools/packages.js | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/package-version-parser/package-version-parser.js b/packages/package-version-parser/package-version-parser.js index f3618e0fdf..4d7c4b8543 100644 --- a/packages/package-version-parser/package-version-parser.js +++ b/packages/package-version-parser/package-version-parser.js @@ -11,10 +11,10 @@ PackageVersion.parseVersionConstraint = function (versionString) { return versionDesc; } - if (versionString.charAt(0) === '=') { +/* if (versionString.charAt(0) === '=') { versionDesc.exact = true; versionString = versionString.substr(1); - } + } */ // XXX check for a dash in the version in case of foo@1.2.3-rc0 diff --git a/tools/commands.js b/tools/commands.js index d4e99876b6..844b5d7a27 100644 --- a/tools/commands.js +++ b/tools/commands.js @@ -551,7 +551,7 @@ main.registerCommand({ var getVersionFromVersionConstraint = function(constraint) { - if (constraint[0] === "=") { + if (constraint && constraint[0] === "=") { return constraint.split("=")[1]; } return constraint; @@ -609,6 +609,7 @@ constraint.packageName + "@" + constraint.versionConstraint + ": no such versio // Add the package to the list of packages that we use directly. usingDirectly[constraint.packageName] = constraint.versionConstraint; var usingIndirectly = project.getDepsAsObj(project.getIndirectDependencies(options.appDir)); + console.log(usingDirectly); // Call the constraint solver. var ConstraintSolver = unipackage.load({ @@ -617,7 +618,10 @@ constraint.packageName + "@" + constraint.versionConstraint + ": no such versio release: release.current.name })['constraint-solver'].ConstraintSolver; + console.log("Going to init constraint resolver"); var resolver = new ConstraintSolver.Resolver(cat); + console.log("Initialized constraint resolver"); + var newVersions = resolver.resolve(usingDirectly, usingIndirectly, { optionsGoHere : false }); @@ -1476,7 +1480,7 @@ main.registerCommand({ if (! version) { process.stderr.write( -"That package cannot be published because it doesn't have a version.\n"); + "That package cannot be published because it doesn't have a version.\n"); return 1; } diff --git a/tools/packages.js b/tools/packages.js index e6c5d4bcf0..76626136ab 100644 --- a/tools/packages.js +++ b/tools/packages.js @@ -982,14 +982,14 @@ _.extend(Package.prototype, { _.keys(self.defaultSlices)); //XXX: this is commented out, but maybe shouldn't be. - if (! chosenArch) { + /*if (! chosenArch) { buildmessage.error( (self.name || "this app") + " is not compatible with architecture '" + arch + "'", { secondary: true }); // recover by returning by no slices return []; - } + }*/ return _.map(self.defaultSlices[chosenArch], function (name) { return self.getSingleSlice(name, arch);