From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-776609-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 2E90B138A87
for <garchives@archives.gentoo.org>; Tue, 24 Feb 2015 01:26:23 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 75B8CE08DC;
Tue, 24 Feb 2015 01:26:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A38B1E08DA
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Feb 2015 01:26:09 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C6138340962
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Feb 2015 01:26:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D6520126B9
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Feb 2015 01:26:04 +0000 (UTC)
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" <vapier@gentoo.org>
Message-ID: <1424637244.8c6955ca99d10ebae0b7431c3ec572f55b9daa6f.vapier@gentoo>
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
X-VCS-Repository: proj/portage-utils
X-VCS-Files: qmerge.c
X-VCS-Directories: /
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
X-VCS-Revision: 8c6955ca99d10ebae0b7431c3ec572f55b9daa6f
X-VCS-Branch: master
Date: Tue, 24 Feb 2015 01:26:04 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 8e0cbbaf-e103-4b78-896e-0878f18f4ae9
X-Archives-Hash: 22779db69adb32c7c0c1cf16ae14310c
commit: 8c6955ca99d10ebae0b7431c3ec572f55b9daa6f
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 22 20:34:04 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Feb 22 20:34:04 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/portage-utils.git;a=commit;h=8c6955ca
qmerge: drop --nomd5 flag
---
qmerge.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/qmerge.c b/qmerge.c
index 7556b4b..3281424 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -35,7 +35,7 @@
int old_repo = 0;
-#define QMERGE_FLAGS "fFsKUpuyO5" COMMON_FLAGS
+#define QMERGE_FLAGS "fFsKUpuyO" COMMON_FLAGS
static struct option const qmerge_long_opts[] = {
{"fetch", no_argument, NULL, 'f'},
{"force", no_argument, NULL, 'F'},
@@ -46,7 +46,6 @@ static struct option const qmerge_long_opts[] = {
{"update", no_argument, NULL, 'u'},
{"yes", no_argument, NULL, 'y'},
{"nodeps", no_argument, NULL, 'O'},
- {"nomd5", no_argument, NULL, '5'},
{"debug", no_argument, NULL, 128},
COMMON_LONG_OPTS
};
@@ -60,7 +59,6 @@ static const char * const qmerge_opts_help[] = {
"Update only",
"Don't prompt before overwriting",
"Don't merge dependencies",
- "Don't verify MD5 digest of files",
"Run shell funcs with `set -x`",
COMMON_OPTS_HELP
};
@@ -72,7 +70,6 @@ char install = 0;
char uninstall = 0;
char force_download = 0;
char follow_rdepends = 1;
-char nomd5 = 0;
char qmerge_strict = 0;
char update_only = 0;
bool debug = false;
@@ -1254,9 +1251,6 @@ pkg_verify_checksums(char *fname, const struct pkg_t *pkg, const depend_atom *at
char *hash = NULL;
int ret = 0;
- if (nomd5)
- return ret;
-
if (pkg->MD5[0]) {
if ((hash = (char*) hash_file(fname, HASH_MD5)) == NULL) {
errf("hash is NULL for %s", fname);
@@ -1898,7 +1892,6 @@ int qmerge_main(int argc, char **argv)
case 'u': update_only = 1;
case 'y': interactive = 0; break;
case 'O': follow_rdepends = 0; break;
- case '5': nomd5 = 1; break;
case 128: debug = true; break;
COMMON_GETOPTS_CASES(qmerge)
}