[gnome-ostree] build: Write gnome-ostree/buildmaster-x86_64-{runtime, devel}

[Colin Walters <walters src gnome org>]

commit d8a0f018ad7a083a403fc24f766b2eca75be77ea
Author: Colin Walters <walters verbum org>
Date:   Thu Feb 21 08:37:30 2013 -0500

    build: Write gnome-ostree/buildmaster-x86_64-{runtime,devel}
    
    As further work on killing the "prefix" concept, the result of
    a build has a new naming scheme.  Instead of
    
    trees/gnomeos-3.8-x86_64-devel
    
    we write:
    
    gnome-ostree/buildmaster-x86_64-devel
    
    The main benefit of the new scheme is that separate operating systems
    can cleanly share one repo, which allows efficient branching.
    
    The idea behind the "buildmaster" tag is that the smoketests could
    create a separate gnome-ostree/smoketested-x86_64-devel tag, etc.

 manifest.json                       |    1 -
 src/ostbuild/js/tasks/task-build.js |   10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index dcfbb6b..acc2bf2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,6 @@
   "00ostbuild-manifest-version": 0,
 
   "osname": "gnome-ostree",
-  "default-target": "trees/gnomeos-3.8-x86_64-runtime",
   "prefix": "gnomeos-3.8",
   "architectures": ["x86_64"],
   "base": {
diff --git a/src/ostbuild/js/tasks/task-build.js b/src/ostbuild/js/tasks/task-build.js
index 840d7ea..e01635f 100644
--- a/src/ostbuild/js/tasks/task-build.js
+++ b/src/ostbuild/js/tasks/task-build.js
@@ -645,7 +645,7 @@ const TaskBuild = new Lang.Class({
         let contentsPath = composeRootdir.resolve_relative_path('usr/share/contents.json');
         JsonUtil.writeJsonFileAtomic(contentsPath, this._snapshot.data, cancellable);
 
-        let treename = 'trees/' + target['name'];
+        let treename = this.osname + '/' + target['name'];
         
         let ostreeRevision = ProcUtil.runSyncGetOutputUTF8Stripped(['ostree', '--repo=' + 
this.repo.get_path(),
                                                                    'commit', '-b', treename, '-s', 'Compose',
@@ -747,7 +747,10 @@ const TaskBuild = new Lang.Class({
                              cancellable);
        let data = srcdb.loadFromPath(workingSnapshotPath, cancellable);
        this._snapshot = new Snapshot.Snapshot(data, workingSnapshotPath);
-       this.prefix = this._snapshot.data['prefix'];
+        let prefix = this._snapshot.data['prefix'];
+       this.prefix = prefix;
+        let osname = this._snapshot.data['osname'];
+       this.osname = osname;
 
        this.patchdir = this.workdir.get_child('patches');
 
@@ -785,7 +788,6 @@ const TaskBuild = new Lang.Class({
                             cancellable);
        }
 
-        let prefix = this._snapshot.data['prefix'];
         let basePrefix = this._snapshot.data['base']['name'] + '/' + prefix;
         let architectures = this._snapshot.data['architectures'];
 
@@ -870,7 +872,7 @@ const TaskBuild = new Lang.Class({
                let architecture = architectures[i];
                 let target = {};
                 targetsList.push(target);
-                target['name'] = prefix + '-' + architecture + '-' + targetComponentType;
+                target['name'] = 'buildmaster/' + architecture + '-' + targetComponentType;
 
                 let runtimeRef = basePrefix + '-' + architecture + '-runtime';
                 let buildrootRef = basePrefix + '-' + architecture + '-devel';