X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id C19ABDC6008 for ; Thu, 27 Jun 2013 19:29:10 +0000 (UTC) Received: from compute5.internal (compute5.nyi.mail.srv.osa [10.202.2.45]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 1E78720E7C for ; Thu, 27 Jun 2013 15:29:07 -0400 (EDT) Received: from frontend2.nyi.mail.srv.osa ([10.202.2.161]) by compute5.internal (MEProxy); Thu, 27 Jun 2013 15:29:08 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=from:to:subject:date:message-id :in-reply-to:references; s=smtpout; bh=E7/sBHiM+q9Zvyf95CemIfjAt qU=; b=mvVJmwfCYlowR9iBFMDzynxUpEL7KGqDybGck7Yfry0JdqduzX1BLRB+2 LU+gQm3QSv0kLaOrjsFmnnZJM9FCgJZ8wqN3ywonQRlXyBhtRQEmdkWWo7R8mIl4 PimB91A0Xg76KY/uO9p/aEkZ3egfCP94x4/fVPgf8Xk35S4UMc= X-Sasl-enc: IIrGQ04JTcR/M6MTOejtNeOOzNA+8PprKIwSvaaw5EGT 1372361345 Received: from localhost (unknown [69.86.161.244]) by mail.messagingengine.com (Postfix) with ESMTPA id 69189680480 for ; Thu, 27 Jun 2013 15:29:05 -0400 (EDT) From: Dubiousjim To: alpine-devel@lists.alpinelinux.org Subject: [alpine-devel] [PATCH 10/15] remove "apk info -i" short option Date: Thu, 27 Jun 2013 15:28:55 -0400 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: I'm not sure if either the short or long options work presently (try it with abuildhelper). But in any case, I noticed in an earlier version of apk-tools that the short option wasn't working, perhaps because the generic command-line option '-i' is parsed first. This option for "apk info" is uncommon enough that a short form (polluting the usage namespace) doesn't seem necessary. Would be nice to also delete the short option -I (leaving just the long options --install-if and --rinstall-if), but I haven't implemented that here. --- src/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/info.c b/src/info.c index 578e118..62866eb 100644 --- a/src/info.c +++ b/src/info.c @@ -363,7 +363,7 @@ static int info_parse(void *pctx, struct apk_db_options *dbopts, case 'I': ctx->subaction_mask |= APK_INFO_INSTALL_IF; break; - case 'i': + case 0x10001: ctx->subaction_mask |= APK_INFO_RINSTALL_IF; break; case 's': @@ -425,7 +425,7 @@ static struct apk_option info_options[] = { { 'r', NULL, "Synonym for -R (deprecated)" }, { 'P', "provides", "List virtual packages provided by PACKAGE" }, { 0x10000, "replaces", "List packages whom files PACKAGE might replace" }, - { 'i', "install-if", "List the PACKAGE's install_if rule" }, + { 0x10001, "install-if", "List the PACKAGE's install_if rule" }, { 'I', "rinstall-if", "List all packages having install_if referencing PACKAGE" }, { 'w', "webpage", "Show URL for more information about PACKAGE" }, { 's', "size", "Show installed size of PACKAGE" }, -- 1.8.3.1 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---