Debian.pm: debian_overlays: Do not make $func callback for nonexistent dirs

This means that it is now OK not to have an `overlay-local'.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 0185761003bfe69e6c4b5ddf2077615d2a42d524..125d499da79dff47c45ff60c5c870938644f8c5a 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -818,8 +818,19 @@ END
 
 sub debian_overlays ($$) {
     my ($ho, $func) = @_;
-    $func->($c{OverlayLocal}, 'overlay-local.tar');
-    $func->('overlay', 'overlay.tar');
+    # calls $func->($local_dir, $tarball_leafname);
+    my $maybe = sub {
+       my ($local_dir, $tarball_leafname) = @_;
+       if (stat $local_dir) {
+           $func->($local_dir, $tarball_leafname);
+       } elsif ($! == ENOENT) {
+           # ok
+       } else {
+           die "debian_overlays cannot check $local_dir: $!";
+       }
+    };
+    $maybe->($c{OverlayLocal}, 'overlay-local.tar');
+    $maybe->('overlay', 'overlay.tar');
 }
 
 sub preseed_base ($$$;@) {