[Pkg-javascript-commits] [dojo] 02/27: 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.7.6
in repository dojo.

commit 95b0c7254bdc992b9c2cb846c7f1e92421306bb3
Author: Colin Snover <github.com at zetafleet.com>
Date:   Thu Aug 22 06:31:42 2013 +0000

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

diff --git a/_base/kernel.js b/_base/kernel.js
index 53822bd..41e0b0c 100644
--- a/_base/kernel.js
+++ b/_base/kernel.js
@@ -93,10 +93,10 @@ define(["../has", "./config", "require", "module"], function(has, config, requir
 			this.revision = 0;
 		}
 	=====*/
-	var rev = "$Rev: 4b3bfd5 $".match(/\d+/);
+	var rev = "$Rev: 4b3bfd5 $".match(/[0-9a-f]{7,}/);
 	dojo.version = {
 		major: 1, minor: 7, patch: 5, flag: "",
-		revision: rev ? +rev[0] : NaN,
+		revision: rev ? rev[0] : NaN,
 		toString: function(){
 			var v = dojo.version;
 			return v.major + "." + v.minor + "." + v.patch + v.flag + " (" + v.revision + ")";	// String

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