1*4882a593SmuzhiyunFrom 4ccef40918a539905a2951bfb81cf8dba4a245c6 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Thomas Petazzoni <thomas.petazzoni@bootlin.com> 3*4882a593SmuzhiyunDate: Wed, 2 Jan 2019 18:15:50 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Revert "main: assume --modversion insted of --version if 5*4882a593Smuzhiyun other flags or module names are provided" 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunThis reverts commit 12a0eb124cea85586e57f33c91a1e4c73459eef6, as it 8*4882a593Smuzhiyuncauses pkg-config to assume --modversion is used when something as 9*4882a593Smuzhiyunsimple as 'pkg-config --static --version' is used, leading to a 10*4882a593Smuzhiyunfailure instead of the expected behavior: the one of "pkg-config 11*4882a593Smuzhiyun--version". 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunSigned-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun cli/main.c | 14 ++------------ 16*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 12 deletions(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/cli/main.c b/cli/main.c 19*4882a593Smuzhiyunindex b52cc85..c5acc10 100644 20*4882a593Smuzhiyun--- a/cli/main.c 21*4882a593Smuzhiyun+++ b/cli/main.c 22*4882a593Smuzhiyun@@ -1002,18 +1002,8 @@ main(int argc, char *argv[]) 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun if ((want_flags & PKG_VERSION) == PKG_VERSION) 25*4882a593Smuzhiyun { 26*4882a593Smuzhiyun- if (argc > 2) 27*4882a593Smuzhiyun- { 28*4882a593Smuzhiyun- fprintf(stderr, "%s: --version specified with other options or module names, assuming --modversion.\n", argv[0]); 29*4882a593Smuzhiyun- 30*4882a593Smuzhiyun- want_flags &= ~PKG_VERSION; 31*4882a593Smuzhiyun- want_flags |= PKG_MODVERSION; 32*4882a593Smuzhiyun- } 33*4882a593Smuzhiyun- else 34*4882a593Smuzhiyun- { 35*4882a593Smuzhiyun- version(); 36*4882a593Smuzhiyun- return EXIT_SUCCESS; 37*4882a593Smuzhiyun- } 38*4882a593Smuzhiyun+ version(); 39*4882a593Smuzhiyun+ return EXIT_SUCCESS; 40*4882a593Smuzhiyun } 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun if ((want_flags & PKG_HELP) == PKG_HELP) 43*4882a593Smuzhiyun-- 44*4882a593Smuzhiyun2.20.1 45*4882a593Smuzhiyun 46