Rename create -> treecompose
It's just a better name. Also matches what we already did for the autobuilder.
This commit is contained in:
parent
05d348528e
commit
1319e1616d
@ -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)
|
||||
|
@ -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(' '));
|
||||
|
@ -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 }
|
||||
};
|
||||
|
@ -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");
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user