be8f838 Fix newlines display for progress bar. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix newlines display for progress bar.

Vsevolod Stakhov committed 11 years ago

commit be8f83804919611d2f2ce4825dce8d58f41c45c1
parent 1f20a66

2 files changed +3 -2

modified libpkg/pkg_jobs.c

@@ -2102,6 +2102,7 @@ jobs_solve_install_upgrade(struct pkg_jobs *j)

 				}
 				pkgdb_it_free(it);
 			}
 			pkg_emit_progress_tick(jcount, jcount);
 			LL_FREE(candidates, free);
 		}
 		else {

modified src/event.c

@@ -345,7 +345,7 @@ progress_alarm_handler(int signo)

 static void
 stop_progressbar(void)
 {
 	if (progress_alarm)
 	if (progress_started)
 		putchar('\n');
 	last_progress_percent = -1;

@@ -366,7 +366,7 @@ draw_progressbar(int64_t current, int64_t total)

 	int hours, minutes, seconds;
 	int r = 0;
 	percent = (total != 0) ? (current * 100 / total) : 100;
 	percent = (total != 0) ? (current * 100. / total) : 100;
 	if (progress_started && (percent != last_progress_percent || current == total)) {
 		last_progress_percent = percent;