From 601e280ce6380636a56974afc57bb44d88e0ba1c Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Fri, 18 Apr 2014 15:27:06 +0000 Subject: Generate .deps file --- lib/Youri/Submit/Action/Dependencies.pm | 71 +++++++++++++++++++++++++++++++ lib/Youri/Submit/Action/RebuildPackage.pm | 12 +++++- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 lib/Youri/Submit/Action/Dependencies.pm diff --git a/lib/Youri/Submit/Action/Dependencies.pm b/lib/Youri/Submit/Action/Dependencies.pm new file mode 100644 index 0000000..b0cd2a1 --- /dev/null +++ b/lib/Youri/Submit/Action/Dependencies.pm @@ -0,0 +1,71 @@ +# $Id$ +package Youri::Submit::Action::Dependencies; + +=head1 NAME + +Youri::Submit::Action::Dependencies - Creates .deps files + +=head1 DESCRIPTION + +This action plugin ensures the creation of .deps files based +on 'dependencies' define + +=cut + +use warnings; +use strict; +use Carp; +use File::Basename; +use base qw/Youri::Submit::Action/; + +sub _init { + my $self = shift; + my %options = ( + perms => 644, + uphost => '', + user => '', + ssh_key => '', + verbose => '', + @_ + ); + croak "undefined upload host" unless $options{uphost}; + croak "undefined ssh key" unless $options{ssh_key}; + + foreach my $var ('perms', 'user', 'uphost', 'ssh_key', 'verbose') { + $self->{"_$var"} = $options{$var}; + } + + return $self; +} + +sub run { + my ($self, $package, $repository, $target, $define) = @_; + croak "Not a class method" unless ref $self; + + return unless $define->{dependencies} =~ /^[\d,]+$/; + + my $file = basename($package->as_file()); + my $dest = $repository->get_upload_dir($package, $target, $define); + my $depsfile = "$dest$file.deps"; + my $deps = $define->{dependencies}; + $deps =~ tr/,/\n/; + + my $cmd = "ssh -i $self->{_ssh_key} $self->{_user}\@$self->{_uphost} \"echo '$deps' > $depsfile\""; + print "Submit::Action::Dependencies: doing $cmd\n" if $self->{_verbose}; + if (!$self->{_test}) { + if (!system($cmd)) { + print "Submit::Action::Dependencies: succeeded!\n"; + return 1 + } + print "Submit::Action::Dependencies: failed!\n"; + } +} +=head1 COPYRIGHT AND LICENSE + +Copyright (C) 2002-2014, YOURI project + +This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. + +=cut + +1; diff --git a/lib/Youri/Submit/Action/RebuildPackage.pm b/lib/Youri/Submit/Action/RebuildPackage.pm index d121090..a2ba4b0 100644 --- a/lib/Youri/Submit/Action/RebuildPackage.pm +++ b/lib/Youri/Submit/Action/RebuildPackage.pm @@ -32,6 +32,12 @@ sub run { croak "Not a class method" unless ref $self; $package->is_source or return 1; + + my $prefix; + if ($package->get_file_name() =~ m/^(\d{14})\..*$/) { + $prefix = $1; + } + my $srpm_name = $package->get_canonical_name; my @packages = $self->{rules}{$srpm_name} or return 1; my $svn = $repository->get_svn_url(); @@ -44,7 +50,11 @@ sub run { chdir 'current'; $updater->update_from_spec(glob('SPECS/*.spec')); system('svn', 'ci', '-m', "Rebuild for new $srpm_name"); - system("mgarepo submit &"); + if ($prefix) { + system("mgarepo submit --define dependencies=$prefix &"); + } else { + system("mgarepo submit &"); + } chdir $oldcwd; } } -- cgit v1.2.1