Skip to content

raise an error when we encounter malformed yamls #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

raise an error when we encounter malformed yamls #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions source/lib/Seco/Multipkg.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,9 @@ sub install_gemspec {

my $geminstalldir = [$self->runcmd("gem environment gemdir")]->[0];
return $self->error("Can't run: $@") if($@);

chomp $geminstalldir;
my $fullinstalldir = $geminstalldir . "/gems/" .
my $fullinstalldir = $geminstalldir . "/gems/" .
$self->info->data->{name} . "-" .
$self->info->data->{version};
foreach ($self->listdir("$installdir/$fullinstalldir")) {
Expand All @@ -320,7 +320,7 @@ sub install_gemspec {

my $name = $self->info->data->{'name'};
my $version = $self->info->data->{'version'};

$self->runcmd("mkdir -p $installdir/$geminstalldir/specifications");
$self->template_file($self->info->confdir . "/templates/gemspec.template",
"$installdir/$geminstalldir/specifications/" .
Expand Down Expand Up @@ -504,7 +504,7 @@ sub build {
$self->info->scripts->{gembuild}) {
# FATAL ON ERRORS
$self->runcmd( "PERL=$perl INSTALLROOT=$destdir DESTDIR=$destdir "
. "PREFIX=$prefix PKGVERID="
. "PREFIX=$prefix PKGVERID="
. $self->pkgverid . " "
. "PACKAGEVERSION=" . $self->info->data->{version} . " "
. "PACKAGENAME=" . $self->info->data->{name} . " "
Expand All @@ -513,7 +513,7 @@ sub build {
} else {
# FATAL ON ERRORS
$self->runcmd( "PERL=$perl INSTALLROOT=$destdir DESTDIR=$destdir "
. "PREFIX=$prefix PKGVERID="
. "PREFIX=$prefix PKGVERID="
. $self->pkgverid . " "
. "PACKAGEVERSION=" . $self->info->data->{version} . " "
. "PACKAGENAME=" . $self->info->data->{name} . " "
Expand Down Expand Up @@ -808,7 +808,7 @@ sub makepackage {
chomp $self->info->data->{arch};
}

$self->template_file( $self->info->confdir . "/templates/spec.template",
$self->template_file( $self->info->confdir . "/templates/spec.template",
$self->tmpdir . "/spec" );

open my $f, ">>" . $self->tmpdir . "/spec";
Expand All @@ -818,7 +818,7 @@ sub makepackage {
if($self->info->data->{gem}) {
$self->install_gemspec;
}

foreach ( $self->listdir($installdir) ) {
my $path = "$installdir/$_";
next if m{/\.packlist$}; # XXX: cleanup in build, not here
Expand Down Expand Up @@ -1036,17 +1036,17 @@ sub makepackage {
}
}
$self->info->data->{filelist} = join ",", @filelist;

# generate the gemspec file based on that
my $name = $self->info->data->{name};
my $version = $self->info->data->{version};

$self->runcmd("mkdir -p $installdir/$geminstalldir/specifications");

$self->template_file($self->info->confdir . "/templates/gemspec.template",
"$installdir/$geminstalldir/specifications/" .
"$name-$version.gemspec");

chdir($installdir . "/" . $fullinstalldir);
my $gem = undef;
my @ten = $self->runcmd("gem build $installdir/$geminstalldir/" .
Expand Down Expand Up @@ -1118,7 +1118,7 @@ sub _init {

my $table;
eval { $table = YAML::Syck::LoadFile($_); };
return $self->error("$_ exists but is malformed: $@") if $@;
die ("FATAL: $_ exists but is malformed: $@") if $@;
$self->infomsg( "LOADING " . $_ );

foreach my $key ( keys %$table ) {
Expand Down