summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorJan Blunck <jblunck@infradead.org>2014-07-16 12:55:11 -0700
committerJan Blunck <jblunck@infradead.org>2014-07-16 12:55:11 -0700
commit0f5dc45c4f934f34f9fd127336dd24e9d503d581 (patch)
treecfdcfcd49bf8ab71053dee580136e48e2678f438 /Build
parent87270ad7b7456bc06700b15579492190b486840c (diff)
livebuild: Make LiveBuild.pm ignore recipe name base directory as well
Signed-off-by: Jan Blunck <jblunck@infradead.org>
Diffstat (limited to 'Build')
-rw-r--r--Build/LiveBuild.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/Build/LiveBuild.pm b/Build/LiveBuild.pm
index e6bda10..00da9e3 100644
--- a/Build/LiveBuild.pm
+++ b/Build/LiveBuild.pm
@@ -76,7 +76,7 @@ sub parse {
# check that directory layout matches live-build directory structure
for my $file ($tar->list_files('')) {
- next unless $file =~ /^config\/archives\/.*\.list.*/;
+ next unless $file =~ /^(.*\/)?config\/archives\/.*\.list.*/;
warn("$filename: config/archives/*.list* files not allowed!\n");
$ret->{'error'} = "$filename: config/archives/*.list* files not allowed!";
return $ret;
@@ -87,7 +87,7 @@ sub parse {
my @packages = ( 'live-build-desc' );
for my $file ($tar->list_files('')) {
- next unless $file =~ /^config\/package-lists\/.*\.list.*/;
+ next unless $file =~ /^(.*\/)?config\/package-lists\/.*\.list.*/;
push @packages, parse_package_list($tar->get_content($file));
}