From 1319e1616d9b99e5bb55fc362c8390fbc1cf5886 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 22 Mar 2014 15:20:22 -0400
Subject: [PATCH] Rename create -> treecompose

It's just a better name.  Also matches what we already did for the
autobuilder.
---
 Makefile-rpm-ostree.am                                    | 2 +-
 src/autobuilder/js/tasks/task-treecompose.js              | 5 ++---
 src/main.c                                                | 2 +-
 ...e-builtin-create.c => rpmostree-builtin-treecompose.c} | 8 ++++----
 src/rpmostree-builtins.h                                  | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)
 rename src/{rpmostree-builtin-create.c => rpmostree-builtin-treecompose.c} (99%)

diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am
index df4eded8..86b13676 100644
--- a/Makefile-rpm-ostree.am
+++ b/Makefile-rpm-ostree.am
@@ -23,7 +23,7 @@ rpm_ostree_SOURCES = src/main.c \
 	src/rpmostree-postprocess.h \
 	src/rpmostree-postprocess.c \
 	src/rpmostree-builtins.h \
-	src/rpmostree-builtin-create.c \
+	src/rpmostree-builtin-treecompose.c \
 	src/rpmostree-builtin-sign.c \
 	$(NULL)
 rpm_ostree_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src -DPKGLIBDIR=\"$(pkglibdir)\" $(PKGDEP_RPMOSTREE_CFLAGS)
diff --git a/src/autobuilder/js/tasks/task-treecompose.js b/src/autobuilder/js/tasks/task-treecompose.js
index 870df189..ee804d10 100644
--- a/src/autobuilder/js/tasks/task-treecompose.js
+++ b/src/autobuilder/js/tasks/task-treecompose.js
@@ -55,13 +55,12 @@ const TaskTreeCompose = new Lang.Class({
 	else
 	    print("Starting build of " + ref + " previous: " + origRevision);
 
-	let argv = ['rpm-ostree',
-		    '--workdir=' + this.workdir.get_path()];
+	let argv = ['rpm-ostree'];
 
 	let treefilePath = Gio.File.new_for_path('treefile.json');
 	JsonUtil.writeJsonFileAtomic(treefilePath, treefileData, cancellable);
 
-	argv.push.apply(argv, ['create', treefilePath.get_path()]);
+	argv.push.apply(argv, ['treecompose', '--workdir=' + this.workdir.get_path(), treefilePath.get_path()]);
 	let productNameUnix = ref.replace(/\//g, '_');
 	let buildOutputPath = Gio.File.new_for_path('log-' + productNameUnix + '.txt');
 	print("Running: " + argv.map(GLib.shell_quote).join(' '));
diff --git a/src/main.c b/src/main.c
index 86cd949e..c9cb01a8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,7 +32,7 @@
 #include "libgsystem.h"
 
 static RpmOstreeCommand commands[] = {
-  { "create", rpmostree_builtin_create, 0 },
+  { "treecompose", rpmostree_builtin_treecompose, 0 },
   { "sign", rpmostree_builtin_sign, 0 },
   { NULL }
 };
diff --git a/src/rpmostree-builtin-create.c b/src/rpmostree-builtin-treecompose.c
similarity index 99%
rename from src/rpmostree-builtin-create.c
rename to src/rpmostree-builtin-treecompose.c
index a9e72ae9..30089dc1 100644
--- a/src/rpmostree-builtin-create.c
+++ b/src/rpmostree-builtin-treecompose.c
@@ -539,10 +539,10 @@ yuminstall (JsonObject      *treedata,
 }
 
 gboolean
-rpmostree_builtin_create (int             argc,
-                          char          **argv,
-                          GCancellable   *cancellable,
-                          GError        **error)
+rpmostree_builtin_treecompose (int             argc,
+                               char          **argv,
+                               GCancellable   *cancellable,
+                               GError        **error)
 {
   gboolean ret = FALSE;
   GOptionContext *context = g_option_context_new ("- Run yum and commit the result to an OSTree repository");
diff --git a/src/rpmostree-builtins.h b/src/rpmostree-builtins.h
index 88559839..dc15197b 100644
--- a/src/rpmostree-builtins.h
+++ b/src/rpmostree-builtins.h
@@ -32,7 +32,7 @@ typedef struct {
 
 #define BUILTINPROTO(name) gboolean rpmostree_builtin_ ## name (int argc, char **argv, GCancellable *cancellable, GError **error)
 
-BUILTINPROTO(create);
+BUILTINPROTO(treecompose);
 BUILTINPROTO(sign);
 
 #undef BUILTINPROTO