From: Eric Bollengier Date: Mon, 21 Mar 2011 15:59:32 +0000 (+0100) Subject: regress: Add fix for ubuntu dash that adds quotes to "set" output X-Git-Tag: Release-7.0.0~981 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=173b7ec3d041eef3d4e6910687e5ade06476c45c;p=bacula%2Fbacula regress: Add fix for ubuntu dash that adds quotes to "set" output --- diff --git a/regress/scripts/functions.pm b/regress/scripts/functions.pm index a9774a5af1..0d7d5717a2 100644 --- a/regress/scripts/functions.pm +++ b/regress/scripts/functions.pm @@ -73,7 +73,7 @@ BEGIN { open(IN, ". ./config; set |") or die "Could not run shell: $!\n"; while ( my $l = ) { chomp ($l); - if ($l =~ /^([\w\d]+)=(.+)/) { + if ($l =~ /^([\w\d]+)='?([^']+)'?/) { next if ($1 eq 'SHELLOPTS'); # is in read-only ($envar,$enval) = ($1, $2); $ENV{$envar} = $enval; @@ -571,7 +571,7 @@ sub debug sub remote_config { open(FP, ">$REMOTE_FILE/bacula-fd.conf") or - die "ERROR: Can't open $REMOTE_FILE/bacula-fd.conf $?"; + die "ERROR: Can't open $REMOTE_FILE/bacula-fd.conf $!"; print FP " Director { Name = $HOST-dir