From 354ba70dc5959c671c5a51341d48a4c730b51c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Mon, 3 Feb 2014 13:08:34 +0200
Subject: [PATCH] fetch: disable progress when outputting pkg to stdout
---
src/fetch.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/fetch.c b/src/fetch.c
index cf2fde7da6b2..d619c41e5306 100644
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -241,6 +241,9 @@ static int fetch_main(void *pctx, struct apk_database *db, struct apk_string_arr
struct fetch_ctx *ctx = (struct fetch_ctx *) pctx;
void *mark = (ctx->flags & FETCH_RECURSIVE) ? mark_name_recursive : mark_name;
+ if (ctx->flags & FETCH_STDOUT)
+ apk_flags &= ~APK_PROGRESS;
+
if (ctx->outdir_fd == 0)
ctx->outdir_fd = AT_FDCWD;
@@ -262,7 +265,7 @@ static struct apk_option fetch_options[] = {
{ 'L', "link", "Create hard links if possible" },
{ 'R', "recursive", "Fetch the PACKAGE and all its dependencies" },
{ 's', "stdout",
- "Dump the .apk to stdout (incompatible with -o and -R)" },
+ "Dump the .apk to stdout (incompatible with -o, -R, --progress)" },
{ 'o', "output", "Directory to place the PACKAGEs to",
required_argument, "DIR" },
};
--
GitLab