switch: Don't check whether revision matches
It's quite possible that say "buildmaster" and "smoketested" are the same revision - but we should allow switching between them.
This commit is contained in:
parent
b762c2f8f1
commit
c85682cb85
|
|
@ -46,7 +46,6 @@ ot_admin_builtin_switch (int argc, char **argv, OstreeSysroot *sysroot, GCancell
|
||||||
GOptionContext *context;
|
GOptionContext *context;
|
||||||
const char *new_ref = NULL;
|
const char *new_ref = NULL;
|
||||||
gs_unref_object OstreeRepo *repo = NULL;
|
gs_unref_object OstreeRepo *repo = NULL;
|
||||||
gs_free char *origin_refspec = NULL;
|
|
||||||
gs_free char *origin_remote = NULL;
|
gs_free char *origin_remote = NULL;
|
||||||
gs_free char *origin_ref = NULL;
|
gs_free char *origin_ref = NULL;
|
||||||
gs_free char *new_revision = NULL;
|
gs_free char *new_revision = NULL;
|
||||||
|
|
@ -124,11 +123,7 @@ ot_admin_builtin_switch (int argc, char **argv, OstreeSysroot *sysroot, GCancell
|
||||||
error))
|
error))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (strcmp (ostree_deployment_get_csum (merge_deployment), new_revision) == 0)
|
if (TRUE)
|
||||||
{
|
|
||||||
g_print ("Refspec %s is unchanged\n", origin_refspec);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
gs_unref_object GFile *real_sysroot = g_file_new_for_path ("/");
|
gs_unref_object GFile *real_sysroot = g_file_new_for_path ("/");
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue