diff options
| author | Vojta Jina | 2014-03-14 15:59:23 -0700 |
|---|---|---|
| committer | Tobias Bosch | 2014-03-20 14:03:49 -0700 |
| commit | 1517d6d2f26225fdb3f468b42ad7dc7cabf1d962 (patch) | |
| tree | d4c211163593d64c5c93e6c8f4eccbf385191f17 | |
| parent | 6bb17af2e383bab3cadad011fd0240c7e2800bdf (diff) | |
| download | angular.js-1517d6d2f26225fdb3f468b42ad7dc7cabf1d962.tar.bz2 | |
chore(scripts): fix the versions script
| -rw-r--r-- | lib/versions/version-info.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/versions/version-info.js b/lib/versions/version-info.js index 70901fb7..9ef130f0 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; }; /** |
