summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2022-06-09 14:43:08 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2022-06-09 14:46:53 +0200
commitfaa9234f0daafde38105b2a9425b7e3e2be27f8f (patch)
treeef75a71623cf1c45f0b36c6ddf12bc31153ac00f
parent72022ba64b7a328dd1635a767e0faa3e415dd71a (diff)
downloaddrakx-faa9234f0daafde38105b2a9425b7e3e2be27f8f.tar
drakx-faa9234f0daafde38105b2a9425b7e3e2be27f8f.tar.gz
drakx-faa9234f0daafde38105b2a9425b7e3e2be27f8f.tar.bz2
drakx-faa9234f0daafde38105b2a9425b7e3e2be27f8f.tar.xz
drakx-faa9234f0daafde38105b2a9425b7e3e2be27f8f.zip
do not crash if nmap/nmblookup are not installed
mga#12579 had been fixed long time ago by adding deps to drakxtools-backend but this sadly bloats the minimal installation. Fixing the crash enabled to unbloat the minimal install.
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xperl-install/standalone/lsnetdrake2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 7a052e559..83bad327e 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- lsnetdrake: do not crash if nmap or nmblookup are not installed (mga#12579)
+
Version 18.49 - 8 June 2022
- Recognize new kernel 5.17 drivers
diff --git a/perl-install/standalone/lsnetdrake b/perl-install/standalone/lsnetdrake
index 41fcd3b30..12399d2c3 100755
--- a/perl-install/standalone/lsnetdrake
+++ b/perl-install/standalone/lsnetdrake
@@ -15,7 +15,7 @@ $| = 1;
$ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}";
foreach my $class (if_($nfs, fs::remote::nfs->new), if_($smb, fs::remote::smb->new)) {
- foreach my $server (sort_names($class->find_servers)) {
+ foreach my $server (sort_names(eval { $class->find_servers })) {
foreach (sort_names(eval { $class->find_exports($server) })) {
print $class->to_fullstring($_), "\n";
}