aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2004-11-28 04:26:06 +0000
committerJason Woodward2004-11-28 04:26:06 +0000
commit6a6ef19342e128e685f04778049ab96e25ca209f (patch)
treefe72f342221d407bdd19b508b96141c6b91852f8
parent5af743c66a127a5bf4a32fa7d4e2bf4c208bd070 (diff)
downloadslapt-get-6a6ef19342e128e685f04778049ab96e25ca209f.tar.gz
moved some code around in pkg_action_show()
-rw-r--r--ChangeLog2
-rw-r--r--src/action.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ed15c31..f93f7d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
0.9.9e Nov 27, 2004
* rewrote pkg_action_search()
- * --show now shows installed pkgs, and their file list
+ * --show now shows installed pkgs
* get_installed_pkgs() now parses out the packages description as well
* make --search show installed packages that aren't present in available
package list from current sources
diff --git a/src/action.c b/src/action.c
index aff0d73..0cdc567 100644
--- a/src/action.c
+++ b/src/action.c
@@ -349,10 +349,10 @@ void pkg_action_show(const char *pkg_name){
free(p_name);
free(p_version);
- }
-
- if( pkg_regex.reg_return != 0 || pkg == NULL )
+ }else{
pkg = get_newest_pkg(avail_pkgs,pkg_name);
+ if( pkg == NULL ) pkg = get_newest_pkg(installed_pkgs,pkg_name);
+ }
if( pkg != NULL ){