From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 27 Jul 2008 23:20:14 +0000 (-0400)
Subject: libdir can be empty
X-Git-Tag: 2.60~147
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=25142cfa1d5b3603bd4ad22925a66ab6fe936acb;p=ikiwiki.git

libdir can be empty
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0746ef24b..ad41215c1 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -433,14 +433,14 @@ sub listplugins () { #{{{
 	my %ret;
 
 	foreach my $dir (@INC, $config{libdir}) {
-		next unless defined $dir;
+		next unless defined $dir && length $dir;
 		foreach my $file (glob("$dir/IkiWiki/Plugin/*.pm")) {
 			my ($plugin)=$file=~/.*\/(.*)\.pm$/;
 			$ret{$plugin}=1;
 		}
 	}
 	foreach my $dir ($config{libdir}, "$installdir/lib/ikiwiki") {
-		next unless defined $dir;
+		next unless defined $dir && length $dir;
 		foreach my $file (glob("$dir/plugins/*")) {
 			$ret{basename($file)}=1 if -x $file;
 		}
@@ -450,7 +450,7 @@ sub listplugins () { #{{{
 } #}}}
 
 sub loadplugins () { #{{{
-	if (defined $config{libdir}) {
+	if (defined $config{libdir} && length $config{libdir}) {
 		unshift @INC, possibly_foolish_untaint($config{libdir});
 	}