From c85682cb8534ecac6d2064c25ac0abbd4402d2a8 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 26 Feb 2014 15:12:08 -0500 Subject: [PATCH] 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. --- src/ostree/ot-admin-builtin-switch.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/ostree/ot-admin-builtin-switch.c b/src/ostree/ot-admin-builtin-switch.c index d7446184..d1306cf4 100644 --- a/src/ostree/ot-admin-builtin-switch.c +++ b/src/ostree/ot-admin-builtin-switch.c @@ -46,7 +46,6 @@ ot_admin_builtin_switch (int argc, char **argv, OstreeSysroot *sysroot, GCancell GOptionContext *context; const char *new_ref = NULL; gs_unref_object OstreeRepo *repo = NULL; - gs_free char *origin_refspec = NULL; gs_free char *origin_remote = NULL; gs_free char *origin_ref = NULL; gs_free char *new_revision = NULL; @@ -124,11 +123,7 @@ ot_admin_builtin_switch (int argc, char **argv, OstreeSysroot *sysroot, GCancell error)) goto out; - if (strcmp (ostree_deployment_get_csum (merge_deployment), new_revision) == 0) - { - g_print ("Refspec %s is unchanged\n", origin_refspec); - } - else + if (TRUE) { gs_unref_object GFile *real_sysroot = g_file_new_for_path ("/");