aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2020-05-17 14:02:06 +0200
committerFabian Groffen <grobian@gentoo.org>2020-05-17 14:02:06 +0200
commit89e8e0b1285739ca70922afab048c803f125df30 (patch)
treeffb54d74747a378dca8646849dbb65935f1b54a8
parentqmerge: unpack tbz2 file without splitting it first (diff)
downloadportage-utils-89e8e0b1285739ca70922afab048c803f125df30.tar.gz
portage-utils-89e8e0b1285739ca70922afab048c803f125df30.tar.bz2
portage-utils-89e8e0b1285739ca70922afab048c803f125df30.zip
qtbz2: drop warning about archive not being bz2 compressed
Since we support many compression formats, and Portage is switching to zstd compression by default, it makes no sense to warn about the compression format used. Signed-off-by: Fabian Groffen <grobian@gentoo.org>
-rw-r--r--qtbz2.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/qtbz2.c b/qtbz2.c
index a02b477f..7cc0b37b 100644
--- a/qtbz2.c
+++ b/qtbz2.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2019 Gentoo Foundation
+ * Copyright 2005-2020 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*
* Copyright 2005-2010 Ned Ludd - <solar@gentoo.org>
@@ -83,8 +83,6 @@ tbz2_compose(int dir_fd, const char *tarbz2, const char *xpak, const char *tbz2)
fclose(out);
return ret;
}
- if (pread(fd, buf, 3, 0) != 3 || memcmp(buf, "BZh", 3))
- warn("%s: does not appear to be a .tar.bz2", tarbz2);
in_tarbz2 = fdopen(fd, "r");
if (in_tarbz2 == NULL) {
fclose(out);