keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename create -> treecompose

Browse Source 
It's just a better name.  Also matches what we already did for the
autobuilder.
This commit is contained in:
Colin Walters 2014-03-22 15:20:22 -04:00
parent 05d348528e
commit 1319e1616d
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile-rpm-ostree.am
View File

@ -23,7 +23,7 @@ rpm_ostree_SOURCES = src/main.c \
src/rpmostree-postprocess.h \ src/rpmostree-postprocess.h \
src/rpmostree-postprocess.c \ src/rpmostree-postprocess.c \
src/rpmostree-builtins.h \ src/rpmostree-builtins.h \
src/rpmostree-builtin-create.c \ src/rpmostree-builtin-treecompose.c \
src/rpmostree-builtin-sign.c \ src/rpmostree-builtin-sign.c \
$(NULL) $(NULL)
rpm_ostree_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src -DPKGLIBDIR=\"$(pkglibdir)\" $(PKGDEP_RPMOSTREE_CFLAGS) rpm_ostree_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src -DPKGLIBDIR=\"$(pkglibdir)\" $(PKGDEP_RPMOSTREE_CFLAGS)

5
src/autobuilder/js/tasks/task-treecompose.js
View File

@ -55,13 +55,12 @@ const TaskTreeCompose = new Lang.Class({
else else
print("Starting build of " + ref + " previous: " + origRevision); print("Starting build of " + ref + " previous: " + origRevision);
let argv = ['rpm-ostree', let argv = ['rpm-ostree'];
'--workdir=' + this.workdir.get_path()];
let treefilePath = Gio.File.new_for_path('treefile.json'); let treefilePath = Gio.File.new_for_path('treefile.json');
JsonUtil.writeJsonFileAtomic(treefilePath, treefileData, cancellable); 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 productNameUnix = ref.replace(/\//g, '_');
let buildOutputPath = Gio.File.new_for_path('log-' + productNameUnix + '.txt'); let buildOutputPath = Gio.File.new_for_path('log-' + productNameUnix + '.txt');
print("Running: " + argv.map(GLib.shell_quote).join(' ')); print("Running: " + argv.map(GLib.shell_quote).join(' '));

2
src/main.c
View File

@ -32,7 +32,7 @@
#include "libgsystem.h" #include "libgsystem.h"
static RpmOstreeCommand commands[] = { static RpmOstreeCommand commands[] = {
{ "create", rpmostree_builtin_create, 0 }, { "treecompose", rpmostree_builtin_treecompose, 0 },
{ "sign", rpmostree_builtin_sign, 0 }, { "sign", rpmostree_builtin_sign, 0 },
{ NULL } { NULL }
}; };

8
src/rpmostree-builtin-create.c → src/rpmostree-builtin-treecompose.c
View File

@ -539,10 +539,10 @@ yuminstall (JsonObject *treedata,
} }
gboolean gboolean
rpmostree_builtin_create (int argc, rpmostree_builtin_treecompose (int argc,
char **argv, char **argv,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
GOptionContext *context = g_option_context_new ("- Run yum and commit the result to an OSTree repository"); GOptionContext *context = g_option_context_new ("- Run yum and commit the result to an OSTree repository");

2
src/rpmostree-builtins.h
View File

@ -32,7 +32,7 @@ typedef struct {
#define BUILTINPROTO(name) gboolean rpmostree_builtin_ ## name (int argc, char **argv, GCancellable *cancellable, GError **error) #define BUILTINPROTO(name) gboolean rpmostree_builtin_ ## name (int argc, char **argv, GCancellable *cancellable, GError **error)
BUILTINPROTO(create); BUILTINPROTO(treecompose);
BUILTINPROTO(sign); BUILTINPROTO(sign);
#undef BUILTINPROTO #undef BUILTINPROTO