marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps: Use "branch", not "version" when talking about app branches

tingping/wmclass
Alexander Larsson 2015-12-17 20:07:14 +01:00
parent dd7f18aaf2
commit 67de92042b
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builder/builder-manifest.c
View File

@ -38,7 +38,7 @@ struct BuilderManifest {
GObject parent;
char *app_id;
char *version;
char *branch;
char *runtime;
char *runtime_version;
char *sdk;
@ -69,7 +69,7 @@ G_DEFINE_TYPE_WITH_CODE (BuilderManifest, builder_manifest, G_TYPE_OBJECT,
enum {
PROP_0,
PROP_APP_ID,
PROP_VERSION,
PROP_BRANCH,
PROP_RUNTIME,
PROP_RUNTIME_VERSION,
PROP_SDK,
@ -95,7 +95,7 @@ builder_manifest_finalize (GObject *object)
BuilderManifest *self = (BuilderManifest *)object;
g_free (self->app_id);
g_free (self->version);
g_free (self->branch);
g_free (self->runtime);
g_free (self->runtime_version);
g_free (self->sdk);
@ -127,8 +127,8 @@ builder_manifest_get_property (GObject *object,
g_value_set_string (value, self->app_id);
break;
case PROP_VERSION:
g_value_set_string (value, self->version);
case PROP_BRANCH:
g_value_set_string (value, self->branch);
break;
case PROP_RUNTIME:
@ -216,9 +216,9 @@ builder_manifest_set_property (GObject *object,
self->app_id = g_value_dup_string (value);
break;
case PROP_VERSION:
g_free (self->version);
self->version = g_value_dup_string (value);
case PROP_BRANCH:
g_free (self->branch);
self->branch = g_value_dup_string (value);
break;
case PROP_RUNTIME:
@ -323,8 +323,8 @@ builder_manifest_class_init (BuilderManifestClass *klass)
NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_VERSION,
g_param_spec_string ("version",
PROP_BRANCH,
g_param_spec_string ("branch",
"",
"",
NULL,

4
common/xdg-app-dir.c
View File

@ -1604,7 +1604,7 @@ xdg_app_dir_deploy (XdgAppDir *self,
{
g_set_error (error, XDG_APP_DIR_ERROR,
XDG_APP_DIR_ERROR_ALREADY_DEPLOYED,
"%s version %s already deployed", ref, checksum);
"%s branch %s already deployed", ref, checksum);
goto out;
}
@ -1882,7 +1882,7 @@ xdg_app_dir_undeploy (XdgAppDir *self,
{
g_set_error (error, XDG_APP_DIR_ERROR,
XDG_APP_DIR_ERROR_ALREADY_UNDEPLOYED,
"%s version %s already undeployed", ref, checksum);
"%s branch %s already undeployed", ref, checksum);
goto out;
}

2
common/xdg-app-utils.c
View File

@ -313,7 +313,7 @@ xdg_app_compose_ref (gboolean app,
if (!xdg_app_is_valid_branch (branch))
{
xdg_app_fail (error, "'%s' is not a valid version name", branch);
xdg_app_fail (error, "'%s' is not a valid branch name", branch);
return NULL;
}

4
doc/xdg-app-builder.xml
View File

@ -103,8 +103,8 @@
<listitem><para>A string defining the application id.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>version</option></term>
<listitem><para>The version of the application, defaults to master.</para></listitem>
<term><option>branch</option></term>
<listitem><para>The branch of the application, defaults to master.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>runtime</option></term>