summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteven <steven@openbsd.org>2006-05-26 17:12:09 +0000
committersteven <steven@openbsd.org>2006-05-26 17:12:09 +0000
commit83897676671cdc73c648e2e7a0c7b0138e20fdb7 (patch)
tree27f8d6a185e7a35c09f981b0a495f65130626983
parentNo need to have a struct uvm_object in each pmap when all you want is a (diff)
downloadwireguard-openbsd-83897676671cdc73c648e2e7a0c7b0138e20fdb7.tar.xz
wireguard-openbsd-83897676671cdc73c648e2e7a0c7b0138e20fdb7.zip
make pkg_add exit gracefully if it cannot read from a file handle, which
happens when the ssh connection could not be established. ok espie@
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PackageRepository/SCP.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/SCP.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/SCP.pm
index dd2864891b7..cc37e48fb44 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepository/SCP.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository/SCP.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: SCP.pm,v 1.8 2006/03/13 16:08:12 espie Exp $
+# $OpenBSD: SCP.pm,v 1.9 2006/05/26 17:12:09 steven Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -135,6 +135,9 @@ sub list
print $cmdfh "LIST $path\n";
local $_;
$_ = <$getfh>;
+ if (!defined $_) {
+ die "Could not initiate SSH session\n";
+ }
chomp;
if (m/^ERROR:/) {
die $_;