[Pkg-javascript-commits] [dojo] 01/04: Fix Git revision not being correctly added to version object.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag 1.5.4
in repository dojo.

commit df039bba63bf55a813a82bfa1fa716f11af15b75
Author: Colin Snover <github.com at zetafleet.com>
Date:   Fri Aug 23 03:53:32 2013 +0000

    Fix Git revision not being correctly added to version object.
    
    Refs #17176.
    (cherry picked from commit 66608081c2077d12a9c6288201d107a86803a28c)
    
    Conflicts:
    	_base/_loader/bootstrap.js
---
 _base/_loader/bootstrap.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_base/_loader/bootstrap.js b/_base/_loader/bootstrap.js
index f4ca5da..94f329b 100644
--- a/_base/_loader/bootstrap.js
+++ b/_base/_loader/bootstrap.js
@@ -218,7 +218,7 @@ dojo.global = {
 =====*/
 	dojo.locale = d.config.locale;
 
-	var rev = "$Rev: 4b50371 $".match(/\d+/);
+	var rev = "$Rev: 4b50371 $".match(/[0-9a-f]{7,}/);
 
 /*=====
 	dojo.version = function(){
@@ -243,7 +243,7 @@ dojo.global = {
 =====*/
 	dojo.version = {
 		major: 1, minor: 5, patch: 3, flag: "",
-		revision: rev ? +rev[0] : NaN,
+		revision: rev ? rev[0] : NaN,
 		toString: function(){
 			with(d.version){
 				return major + "." + minor + "." + patch + flag + " (" + revision + ")";	// String

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/dojo.git