]> xenbits.xensource.com Git - people/royger/osstest.git/commitdiff
Debian.pm: debian_overlays: Internal default for tarball name
authorIan Jackson <ian.jackson@eu.citrix.com>
Thu, 17 May 2018 14:18:01 +0000 (15:18 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 23 May 2018 16:13:28 +0000 (17:13 +0100)
No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Osstest/Debian.pm

index 125d499da79dff47c45ff60c5c870938644f8c5a..8e724053d939b672340a09b852362165c148030a 100644 (file)
@@ -821,6 +821,7 @@ sub debian_overlays ($$) {
     # calls $func->($local_dir, $tarball_leafname);
     my $maybe = sub {
        my ($local_dir, $tarball_leafname) = @_;
+       $tarball_leafname //= "$local_dir.tar";
        if (stat $local_dir) {
            $func->($local_dir, $tarball_leafname);
        } elsif ($! == ENOENT) {
@@ -830,7 +831,7 @@ sub debian_overlays ($$) {
        }
     };
     $maybe->($c{OverlayLocal}, 'overlay-local.tar');
-    $maybe->('overlay', 'overlay.tar');
+    $maybe->('overlay');
 }
 
 sub preseed_base ($$$;@) {