[ostree] upgrade/switch: Fix status line being overwritten with pull progress



commit 4f04a55a5d56b1376fc9e23ad89eafe2b6b9e717
Author: Colin Walters <walters verbum org>
Date:   Thu Feb 27 16:25:33 2014 -0500

    upgrade/switch: Fix status line being overwritten with pull progress

 src/ostree/ot-admin-builtin-switch.c  |    4 ++--
 src/ostree/ot-admin-builtin-upgrade.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/ostree/ot-admin-builtin-switch.c b/src/ostree/ot-admin-builtin-switch.c
index d1306cf..87f5893 100644
--- a/src/ostree/ot-admin-builtin-switch.c
+++ b/src/ostree/ot-admin-builtin-switch.c
@@ -105,6 +105,8 @@ ot_admin_builtin_switch (int argc, char **argv, OstreeSysroot *sysroot, GCancell
       GSConsole *console;
       gs_unref_object OstreeAsyncProgress *progress = NULL;
 
+      g_print ("Fetching remote %s ref %s\n", origin_remote, new_ref);
+
       console = gs_console_get ();
       if (console)
         {
@@ -112,8 +114,6 @@ ot_admin_builtin_switch (int argc, char **argv, OstreeSysroot *sysroot, GCancell
           progress = ostree_async_progress_new_and_connect (ot_common_pull_progress, console);
         }
 
-      g_print ("Fetching remote %s ref %s\n", origin_remote, new_ref);
-
       if (!ostree_repo_pull (repo, origin_remote, refs_to_fetch, pullflags, progress,
                              cancellable, error))
         goto out;
diff --git a/src/ostree/ot-admin-builtin-upgrade.c b/src/ostree/ot-admin-builtin-upgrade.c
index 4139773..16a4073 100644
--- a/src/ostree/ot-admin-builtin-upgrade.c
+++ b/src/ostree/ot-admin-builtin-upgrade.c
@@ -86,6 +86,8 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel
       GSConsole *console;
       gs_unref_object OstreeAsyncProgress *progress = NULL;
 
+      g_print ("Fetching remote %s ref %s\n", origin_remote, origin_ref);
+
       console = gs_console_get ();
       if (console)
         {
@@ -93,8 +95,6 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel
           progress = ostree_async_progress_new_and_connect (ot_common_pull_progress, console);
         }
 
-      g_print ("Fetching remote %s ref %s\n", origin_remote, origin_ref);
-
       if (!ostree_repo_pull (repo, origin_remote, refs_to_fetch, pullflags, progress,
                              cancellable, error))
         goto out;


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