summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorsteve <steve@FreeBSD.org>2002-01-25 05:10:00 +0000
committersteve <steve@FreeBSD.org>2002-01-25 05:10:00 +0000
commit010923f35d509bc3e81efb546e950e4916d086b3 (patch)
treea7f251aefda2b8932e465a2a7d9968d4be36d94c /usr.sbin
parent96d2f68a834c0946ed292f01a7ec3d9f03645db6 (diff)
downloadFreeBSD-src-010923f35d509bc3e81efb546e950e4916d086b3.zip
FreeBSD-src-010923f35d509bc3e81efb546e950e4916d086b3.tar.gz
Don't bogusly look for inexact matches because a package contains a '-'
for packages like sawfish-gnome for instance. Reviewed by: murray, sobomax
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sysinstall/package.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index e7e6c2f..5a21e32 100644
--- a/usr.sbin/sysinstall/package.c
+++ b/usr.sbin/sysinstall/package.c
@@ -55,7 +55,7 @@ extern PkgNode Top;
int
package_add(char *name)
{
- PkgNodePtr tmp, tmp2, *tmp3;
+ PkgNodePtr tmp;
int i;
if (!mediaVerify())
@@ -68,8 +68,7 @@ package_add(char *name)
if (DITEM_STATUS(i) != DITEM_SUCCESS)
return i;
- tmp3 = strpbrk(name, "-") ? NULL : &tmp2;
- tmp = index_search(&Top, name, tmp3);
+ tmp = index_search(&Top, name, &tmp);
if (tmp)
return index_extract(mediaDevice, &Top, tmp, FALSE);
else {
OpenPOWER on IntegriCloud