packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Colin Walters 2014-02-27 16:25:33 -05:00
parent d8852d099a
commit 4f04a55a5d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ostree/ot-admin-builtin-switch.c
View File

@ -105,6 +105,8 @@ ot_admin_builtin_switch (int argc, char **argv, OstreeSysroot *sysroot, GCancell
GSConsole *console; GSConsole *console;
gs_unref_object OstreeAsyncProgress *progress = NULL; gs_unref_object OstreeAsyncProgress *progress = NULL;
g_print ("Fetching remote %s ref %s\n", origin_remote, new_ref);
console = gs_console_get (); console = gs_console_get ();
if (console) 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); 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, if (!ostree_repo_pull (repo, origin_remote, refs_to_fetch, pullflags, progress,
cancellable, error)) cancellable, error))
goto out; goto out;

4
src/ostree/ot-admin-builtin-upgrade.c
View File

@ -86,6 +86,8 @@ ot_admin_builtin_upgrade (int argc, char **argv, OstreeSysroot *sysroot, GCancel
GSConsole *console; GSConsole *console;
gs_unref_object OstreeAsyncProgress *progress = NULL; gs_unref_object OstreeAsyncProgress *progress = NULL;
g_print ("Fetching remote %s ref %s\n", origin_remote, origin_ref);
console = gs_console_get (); console = gs_console_get ();
if (console) 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); 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, if (!ostree_repo_pull (repo, origin_remote, refs_to_fetch, pullflags, progress,
cancellable, error)) cancellable, error))
goto out; goto out;