projects
/
librecmc
/
librecmc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ede4e23
)
opkg: fix find logic introduced by previous commit
author
Jo-Philipp Wich
<jow@openwrt.org>
Thu, 15 Nov 2012 20:53:51 +0000
(20:53 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Thu, 15 Nov 2012 20:53:51 +0000
(20:53 +0000)
SVN-Revision: 34203
package/opkg/patches/060-add-find-command.patch
patch
|
blob
|
history
diff --git
a/package/opkg/patches/060-add-find-command.patch
b/package/opkg/patches/060-add-find-command.patch
index 219df1018705f1d531b652644b8517a732123118..17625349f8e8e637ce3348fcc1ac136b65a730d3 100644
(file)
--- a/
package/opkg/patches/060-add-find-command.patch
+++ b/
package/opkg/patches/060-add-find-command.patch
@@
-9,17
+9,17
@@
{
int i;
pkg_vec_t *available;
{
int i;
pkg_vec_t *available;
-@@ -612,6 +612,9 @@ opkg_list_cmd(int argc, char **argv)
+@@ -610,7 +610,8 @@ opkg_list_cmd(int argc, char **argv)
+ for (i=0; i < available->len; i++) {
+ pkg = available->pkgs[i];
/* if we have package name or pattern and pkg does not match, then skip it */
/* if we have package name or pattern and pkg does not match, then skip it */
- if (pkg_name && fnmatch(pkg_name, pkg->name, conf->nocase))
+- if (pkg_name && fnmatch(pkg_name, pkg->name, conf->nocase))
++ if (pkg_name && fnmatch(pkg_name, pkg->name, conf->nocase) &&
++ (!use_desc || !pkg->description || fnmatch(pkg_name, pkg->description, conf->nocase)))
continue;
continue;
-+ if (pkg_name && use_desc && pkg->description &&
-+ fnmatch(pkg_name, pkg->description, conf->nocase))
-+ continue;
print_pkg(pkg);
}
print_pkg(pkg);
}
- pkg_vec_free(available);
-@@ -619,6 +622,18 @@ opkg_list_cmd(int argc, char **argv)
+@@ -619,6 +620,18 @@ opkg_list_cmd(int argc, char **argv)
return 0;
}
return 0;
}
@@
-38,7
+38,7
@@
static int
opkg_list_installed_cmd(int argc, char **argv)
static int
opkg_list_installed_cmd(int argc, char **argv)
-@@ -1262,6 +127
7
,7 @@ static opkg_cmd_t cmds[] = {
+@@ -1262,6 +127
5
,7 @@ static opkg_cmd_t cmds[] = {
{"configure", 0, (opkg_cmd_fun_t)opkg_configure_cmd, PFM_DESCRIPTION|PFM_SOURCE},
{"files", 1, (opkg_cmd_fun_t)opkg_files_cmd, PFM_DESCRIPTION|PFM_SOURCE},
{"search", 1, (opkg_cmd_fun_t)opkg_search_cmd, PFM_DESCRIPTION|PFM_SOURCE},
{"configure", 0, (opkg_cmd_fun_t)opkg_configure_cmd, PFM_DESCRIPTION|PFM_SOURCE},
{"files", 1, (opkg_cmd_fun_t)opkg_files_cmd, PFM_DESCRIPTION|PFM_SOURCE},
{"search", 1, (opkg_cmd_fun_t)opkg_search_cmd, PFM_DESCRIPTION|PFM_SOURCE},