[ostree] switch: Don't check whether revision matches



commit c85682cb8534ecac6d2064c25ac0abbd4402d2a8
Author: Colin Walters <walters verbum org>
Date:   Wed Feb 26 15:12:08 2014 -0500

    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 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/src/ostree/ot-admin-builtin-switch.c b/src/ostree/ot-admin-builtin-switch.c
index d744618..d1306cf 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 ("/");
       


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]