From 2b741dc8b8568bab1a687ac14eefbae126654e97 Mon Sep 17 00:00:00 2001
From: Vojta Jina
Date: Fri, 14 Mar 2014 15:59:23 -0700
Subject: chore(scripts): fix the versions script

---
 lib/versions/version-info.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib/versions/version-info.js')

diff --git a/lib/versions/version-info.js b/lib/versions/version-info.js
index 5bf06585..5689e946 100644
--- a/lib/versions/version-info.js
+++ b/lib/versions/version-info.js
@@ -74,16 +74,17 @@ var getTaggedVersion = function() {
   var gitTagResult = shell.exec('git describe --exact-match', {silent:true});
 
   if ( gitTagResult.code === 0 ) {
-    var tag = gitTagResult.output;
+    var tag = gitTagResult.output.trim();
     var version = semver.parse(tag);
-    if ( version ) {
-      if ( version.satisfies(currentPackage.branchVersion) ) {
-        version.codeName = getCodeName(tag);
-      }
+
+    if ( version && semver.satisfies(version, currentPackage.branchVersion)) {
+      version.codeName = getCodeName(tag);
       version.full = version.version + '+' + version.build;
       return version;
     }
   }
+
+  return null;
 };
 
 /**
-- 
cgit v1.2.3