Commit 59271f8c authored by Timo Teräs's avatar Timo Teräs

print: don't print spurious newlines

parent f38d1f74
......@@ -100,10 +100,10 @@ void apk_print_progress(size_t done, size_t total)
int apk_print_indented(struct apk_indent *i, apk_blob_t blob)
{
if (i->x + blob.len + 1 >= apk_get_screen_width())
i->x = printf("\n%*s" BLOB_FMT, i->indent, "", BLOB_PRINTF(blob)) - 1;
else if (i->x <= i->indent)
if (i->x <= i->indent)
i->x += printf("%*s" BLOB_FMT, i->indent - i->x, "", BLOB_PRINTF(blob));
else if (i->x + blob.len + 1 >= apk_get_screen_width())
i->x = printf("\n%*s" BLOB_FMT, i->indent, "", BLOB_PRINTF(blob)) - 1;
else
i->x += printf(" " BLOB_FMT, BLOB_PRINTF(blob));
apk_progress_force = 1;
......
......@@ -7,5 +7,4 @@ ERROR: unsatisfiable constraints:
conflicted-provider (virtual):
provided by: conflicted-provider-a
conflicted-provider-b
required by:
conflicted-dep-0.1[conflicted-provider]
required by: conflicted-dep-0.1[conflicted-provider]
......@@ -7,5 +7,4 @@ ERROR: unsatisfiable constraints:
conflicted-provider (virtual):
provided by: conflicted-provider-a
conflicted-provider-b
required by:
conflicted-dep-0.1[conflicted-provider]
required by: conflicted-dep-0.1[conflicted-provider]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment