summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-10-03 13:37:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-03 17:18:30 +0100
commit27c30e46d95da244686378fa6aa5971d07cc38e5 (patch)
tree4484abfa1e966c0acdca5fa9eac5a00c6fa05795 /meta/recipes-devtools
parent3b664d0cfc413c3b4968e328c4111b8fb61ad880 (diff)
downloadpoky-27c30e46d95da244686378fa6aa5971d07cc38e5.tar.gz
rpmresolve: fix reporting of multiple matches error
We were mistakenly writing what was meant to go to stderr into the output file, so when the "Multiple matches" error showed we weren't actually seeing the matches printed. Also change the wording of the "Unable to find package..." to "Unable to resolve package..." instead so that it makes more sense if it is printed after the "Multiple matches" error. (From OE-Core rev: c26542eb4e8707b9639ec309a44809a728839db8) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c6
-rw-r--r--meta/recipes-devtools/rpm/rpmresolve_1.0.bb2
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c b/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
index 3613ee5a8d..4e9d055f24 100644
--- a/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
+++ b/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
@@ -185,7 +185,7 @@ int processPackages(rpmts *ts, int tscount, const char *packagelistfn, int ignor
185 char *value = NULL; 185 char *value = NULL;
186 rc = getPackageStr(ts[i], keys[keyindex], RPMTAG_PACKAGEORIGIN, &value); 186 rc = getPackageStr(ts[i], keys[keyindex], RPMTAG_PACKAGEORIGIN, &value);
187 if(rc == 0) 187 if(rc == 0)
188 fprintf(outf, " %s\n", value); 188 fprintf(stderr, " %s\n", value);
189 else 189 else
190 fprintf(stderr, " (%s)\n", keys[keyindex]); 190 fprintf(stderr, " (%s)\n", keys[keyindex]);
191 } 191 }
@@ -197,10 +197,10 @@ int processPackages(rpmts *ts, int tscount, const char *packagelistfn, int ignor
197 197
198 if( !found ) { 198 if( !found ) {
199 if( ignoremissing ) { 199 if( ignoremissing ) {
200 fprintf(stderr, "unable to find package %s - ignoring\n", line); 200 fprintf(stderr, "Unable to resolve package %s - ignoring\n", line);
201 } 201 }
202 else { 202 else {
203 fprintf(stderr, "unable to find package %s\n", line); 203 fprintf(stderr, "Unable to resolve package %s\n", line);
204 missing = 1; 204 missing = 1;
205 } 205 }
206 } 206 }
diff --git a/meta/recipes-devtools/rpm/rpmresolve_1.0.bb b/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
index 3ce4369d0c..ea542e1cc3 100644
--- a/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
+++ b/meta/recipes-devtools/rpm/rpmresolve_1.0.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "OpenEmbedded RPM resolver - performs RPM database lookups in batc
4DEPENDS = "rpm" 4DEPENDS = "rpm"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" 6LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
7PR = "r1" 7PR = "r2"
8 8
9SRC_URI = "file://rpmresolve.c" 9SRC_URI = "file://rpmresolve.c"
10 10