moulette_get: Merge receive_tar and receive_git
This commit is contained in:
parent
9fa9251590
commit
9866ecde45
1 changed files with 4 additions and 33 deletions
|
|
@ -15,10 +15,9 @@ use ACU::Log;
|
||||||
use ACU::Process;
|
use ACU::Process;
|
||||||
|
|
||||||
my %actions = (
|
my %actions = (
|
||||||
"tar" => \&receive_tar,
|
"std" => \&receive_std, #STuDent
|
||||||
"git" => \&receive_git,
|
|
||||||
|
|
||||||
"ref" => \&receive_ref,
|
"ref" => \&receive_ref,
|
||||||
|
|
||||||
"tests" => \&create_testsuite,
|
"tests" => \&create_testsuite,
|
||||||
"moulette" => \&moulette,
|
"moulette" => \&moulette,
|
||||||
);
|
);
|
||||||
|
|
@ -90,35 +89,7 @@ sub receive_ref
|
||||||
remove_tree($tempdir);
|
remove_tree($tempdir);
|
||||||
}
|
}
|
||||||
|
|
||||||
sub receive_tar
|
sub receive_std
|
||||||
{
|
|
||||||
my $args = shift;
|
|
||||||
my $project_id = $args->{param}{id};
|
|
||||||
my $year = $args->{param}{year};
|
|
||||||
my $rendu = $args->{param}{rendu};
|
|
||||||
my $file = $args->{param}{file};
|
|
||||||
my $login = $args->{param}{login} // "ref";
|
|
||||||
|
|
||||||
croak "No file named '$file' given" if (!exists $args->{files}{$file});
|
|
||||||
|
|
||||||
my ($fh, $filename) = tempfile(DIR => '/data/tmp', SUFFIX => $file);
|
|
||||||
binmode($fh);
|
|
||||||
print $fh $args->{files}{$file};
|
|
||||||
close $fh;
|
|
||||||
chmod 0644, $filename;
|
|
||||||
|
|
||||||
my $destdir = ( prepare_dir($year, $project_id, $rendu) )[0];
|
|
||||||
fact_exec("package create $filename $destdir/$login.ff", $destdir);
|
|
||||||
croak "Cannot create $login.ff" if ($?);
|
|
||||||
chmod 0666, "$destdir/$login.ff";
|
|
||||||
|
|
||||||
# Clean
|
|
||||||
unlink $filename;
|
|
||||||
|
|
||||||
run_moulette($project_id, $year, $rendu, $login);
|
|
||||||
}
|
|
||||||
|
|
||||||
sub receive_git
|
|
||||||
{
|
{
|
||||||
my $args = shift;
|
my $args = shift;
|
||||||
my $project_id = $args->{param}{id};
|
my $project_id = $args->{param}{id};
|
||||||
|
|
@ -137,7 +108,7 @@ sub receive_git
|
||||||
croak "An error occurs while extracting the tarball" if ($?);
|
croak "An error occurs while extracting the tarball" if ($?);
|
||||||
|
|
||||||
my $destdir = ( prepare_dir($year, $project_id, $rendu) )[0];
|
my $destdir = ( prepare_dir($year, $project_id, $rendu) )[0];
|
||||||
fact_exec("package create $tempdir $destdir/$login.ff", $destdir);
|
fact_exec("package create '$tempdir' '$destdir/$login.ff'", $destdir);
|
||||||
croak "Cannot create $login.ff" if ($?);
|
croak "Cannot create $login.ff" if ($?);
|
||||||
chmod 0666, "$destdir/$login.ff";
|
chmod 0666, "$destdir/$login.ff";
|
||||||
|
|
||||||
|
|
|
||||||
Reference in a new issue