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

commit 0e5638b8847f0464931c2dc749dbc93136588a28
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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/_base/kernel.js b/_base/kernel.js
index 1f7765a..f2f7211 100644
--- a/_base/kernel.js
+++ b/_base/kernel.js
@@ -79,7 +79,7 @@ define(["../has", "./config", "require", "module"], function(has, config, requir
 	dojo.isAsync = !has("dojo-loader") || require.async;
 	dojo.locale = config.locale;
 
-	var rev = "$Rev: 585eba5 $".match(/\d+/);
+	var rev = "$Rev: 585eba5 $".match(/[0-9a-f]{7,}/);
 	dojo.version = {
 		// summary:
 		//		Version number of the Dojo Toolkit
@@ -90,10 +90,10 @@ define(["../has", "./config", "require", "module"], function(has, config, requir
 		//		- minor: Integer: Minor version. If total version is "1.2.0beta1", will be 2
 		//		- patch: Integer: Patch version. If total version is "1.2.0beta1", will be 0
 		//		- flag: String: Descriptor flag. If total version is "1.2.0beta1", will be "beta1"
-		//		- revision: Number: The SVN rev from which dojo was pulled
+		//		- revision: Number: The Git rev from which dojo was pulled
 
 		major: 1, minor: 8, 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