projects
/
oweals
/
opkg-lede.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libopkg: suppress empty provides
[oweals/opkg-lede.git]
/
libopkg
/
pkg.c
diff --git
a/libopkg/pkg.c
b/libopkg/pkg.c
index 2e854a95766c30f8f7cb1d53f44acbdf076f5bf7..64ee70a00c401244e8a8e7c1d0c06a2a142d1250 100644
(file)
--- a/
libopkg/pkg.c
+++ b/
libopkg/pkg.c
@@
-462,7
+462,7
@@
set_flags_from_control(pkg_t *pkg){
fp = fopen(file_name, "r");
if (fp == NULL) {
fp = fopen(file_name, "r");
if (fp == NULL) {
- opkg_perror(ERROR, "Failed to open %s");
+ opkg_perror(ERROR, "Failed to open %s"
, file_name
);
free(file_name);
return;
}
free(file_name);
return;
}
@@
-714,7
+714,7
@@
pkg_formatted_field(FILE *fp, pkg_t *pkg, const char *field)
case 'M':
if (strcasecmp(field, "Maintainer") == 0) {
if (pkg->maintainer) {
case 'M':
if (strcasecmp(field, "Maintainer") == 0) {
if (pkg->maintainer) {
- fprintf(fp, "
m
aintainer: %s\n", pkg->maintainer);
+ fprintf(fp, "
M
aintainer: %s\n", pkg->maintainer);
}
} else if (strcasecmp(field, "MD5sum") == 0) {
if (pkg->md5sum) {
}
} else if (strcasecmp(field, "MD5sum") == 0) {
if (pkg->md5sum) {
@@
-731,7
+731,7
@@
pkg_formatted_field(FILE *fp, pkg_t *pkg, const char *field)
} else if (strcasecmp(field, "Priority") == 0) {
fprintf(fp, "Priority: %s\n", pkg->priority);
} else if (strcasecmp(field, "Provides") == 0) {
} else if (strcasecmp(field, "Priority") == 0) {
fprintf(fp, "Priority: %s\n", pkg->priority);
} else if (strcasecmp(field, "Provides") == 0) {
- if (pkg->provides_count) {
+ if (pkg->provides_count
> 1
) {
fprintf(fp, "Provides:");
for(i = 1; i < pkg->provides_count; i++) {
fprintf(fp, "%s %s", i == 1 ? "" : ",",
fprintf(fp, "Provides:");
for(i = 1; i < pkg->provides_count; i++) {
fprintf(fp, "%s %s", i == 1 ? "" : ",",
@@
-1299,7
+1299,8
@@
pkg_run_script(pkg_t *pkg, const char *script, const char *args)
free(cmd);
if (err) {
free(cmd);
if (err) {
- opkg_msg(ERROR, "%s script returned status %d.\n", script, err);
+ opkg_msg(ERROR, "package \"%s\" %s script returned status %d.\n",
+ pkg->name, script, err);
return err;
}
return err;
}