[gnome-continuous] resolve: "tag" should override "branch"



commit 58734328b445fc0429e1ad74828a4f23a6e3622b
Author: Colin Walters <walters verbum org>
Date:   Wed Nov 13 09:49:12 2013 -0500

    resolve: "tag" should override "branch"
    
    Since it's used as a temporary thing.

 src/js/tasks/task-resolve.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/js/tasks/task-resolve.js b/src/js/tasks/task-resolve.js
index ded62d4..18acd4d 100644
--- a/src/js/tasks/task-resolve.js
+++ b/src/js/tasks/task-resolve.js
@@ -80,9 +80,9 @@ const TaskResolve = new Lang.Class({
        let componentNames = this._snapshot.getAllComponentNames();
        for (let i = 0; i < componentNames.length; i++) {
            let component = this._snapshot.getComponent(componentNames[i]);
-           let branchOrTag = component['branch'] || component['tag'];
+           let tagOrBranch = component['tag'] || component['branch'];
             let mirrordir = Vcs.ensureVcsMirror(this.mirrordir, component, cancellable);
-            let revision = Vcs.describeVersion(mirrordir, branchOrTag);
+            let revision = Vcs.describeVersion(mirrordir, tagOrBranch);
             component['revision'] = revision;
        }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]