shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-19 22:50:35 +03:00
Code Issues Projects Releases Wiki Activity

sysroot: Move ostree_sysroot_origin_new_from_refspec here

Browse Source 
Rather than having it live in admin.  This is useful for other
consumers like the test suite.
This commit is contained in:
Colin Walters 2013-10-03 18:32:41 -04:00
parent ae2234b183
commit cb251ae5ca
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libostree/ostree-sysroot.c
View File

@ -1095,3 +1095,18 @@ ostree_sysroot_get_merge_deployment (OstreeSysroot *self,
return NULL;
}
/**
* ostree_sysroot_origin_new_from_refspec:
* @refspec: A refspec
*
* Returns: (transfer full): A new config file which sets @refspec as an origin
*/
GKeyFile *
ostree_sysroot_origin_new_from_refspec (OstreeSysroot *sysroot,
const char *refspec)
{
GKeyFile *ret = g_key_file_new ();
g_key_file_set_string (ret, "origin", "refspec", refspec);
return ret;
}

4
src/libostree/ostree-sysroot.h
View File

@ -84,5 +84,9 @@ gboolean ostree_sysroot_deploy_one_tree (OstreeSysroot *self,
OstreeDeployment *ostree_sysroot_get_merge_deployment (OstreeSysroot *self,
const char *osname);
GKeyFile *ostree_sysroot_origin_new_from_refspec (OstreeSysroot *self,
const char *refspec);
G_END_DECLS

2
src/ostree/ot-admin-builtin-deploy.c
View File

@ -97,7 +97,7 @@ ot_admin_builtin_deploy (int argc, char **argv, OstreeSysroot *sysroot, GCancell
}
else
{
origin = ot_origin_new_from_refspec (refspec);
origin = ostree_sysroot_origin_new_from_refspec (sysroot, refspec);
}
if (!ostree_repo_resolve_rev (repo, refspec, FALSE, &revision, error))

8
src/ostree/ot-admin-functions.c
View File

@ -27,14 +27,6 @@
#include "ostree.h"
#include "libgsystem.h"
GKeyFile *
ot_origin_new_from_refspec (const char *refspec)
{
GKeyFile *ret = g_key_file_new ();
g_key_file_set_string (ret, "origin", "refspec", refspec);
return ret;
}
gboolean
ot_admin_require_booted_deployment_or_osname (OstreeSysroot *sysroot,
const char *osname,

2
src/ostree/ot-admin-functions.h
View File

@ -27,8 +27,6 @@
G_BEGIN_DECLS
GKeyFile *ot_origin_new_from_refspec (const char *refspec);
gboolean
ot_admin_require_booted_deployment_or_osname (OstreeSysroot *sysroot,
const char *osname,