From 352fd710a9a5154fc6d405992bc895cd15f48b3f Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Tue, 10 May 2011 20:41:12 +0000
Subject: - Get rid of Youri::Submit::Pre, only one is defined and we don't use
 it

---
 bin/youri-submit.in | 56 +----------------------------------------------------
 1 file changed, 1 insertion(+), 55 deletions(-)

(limited to 'bin')

diff --git a/bin/youri-submit.in b/bin/youri-submit.in
index 9892d0e..a788e15 100755
--- a/bin/youri-submit.in
+++ b/bin/youri-submit.in
@@ -20,7 +20,6 @@ youri-submit --help [category] [item]
 Options:
 
     --config <file>        use file <file> as config file
-    --skip-pre <pre>       skip pre <pre>
     --skip-check <check>   skip check <check>
     --skip-action <action> skip action <action>
     --skip-post <post>     skip post <post>
@@ -48,10 +47,6 @@ passed to a list of action plugins, depending also on given upload target.
 
 Use given file as configuration, instead of normal one.
 
-=item B<--skip-pre> I<id>
-
-Skip pre transaction plugin with given identity
-
 =item B<--skip-check> I<id>
 
 Skip check plugin with given identity.
@@ -178,7 +173,6 @@ my $config = Youri::Config->new(
         'test'        => '|t!',
         'list'        => '|l!',
         'config'      => '=s',
-        'skip-prei'   => '=s@',
         'skip-post'   => '=s@',
         'skip-reject' => '=s@',
     },
@@ -283,58 +277,10 @@ eval {
 };
 die "Failed to create repository: $@\n" if $@;
 
-# perfrom pre action
-my @errors;
-my $pre_packages = [];
-my $skip_pres = $config->get_arg('skip-pre');
-my %skip_pres = $skip_pres ?  map { $_ => 1 } @{$skip_pres} : ();
-foreach my $id (@{$target_conf->{pres}}) { 
-    next if $skip_pres{$id};
-    print "Creating pre $id\n" if $verbose;
-    my $pre;
-    my $pre_conf = $config->get_param('pres')->{$id};
-
-    if (!$pre_conf) {
-	print STDERR "No such pre $id, skipping\n";
-	next;
-    }
-    eval {
-	$pre = create_instance(
-	    'Youri::Submit::Pre',
-	    $pre_conf,
-	    {
-		id       => $id,
-		test     => $test,
-		verbose  => $verbose > 0 ? $verbose - 1 : 0,
-	    }
-	);
-    };
-    if ($@) {
-	print STDERR "Failed to create pre $id: $@\n";
-    } else {
-	print "running pre $id\n" if $verbose;
-	my @err = $pre->run(
-	    $pre_packages,
-	    $repository,
-	    $target,
-	    $config->get_arg('define')
-	);
-	push(@errors, @err) if $err[0];
-    }
-}
-
-if (@errors) {
-    print "Pre-submission errors, aborting:\n";
-    foreach my $error (@errors) {
-	print " - $error\n";
-    }
-    exit(1)
-}
-
 # create packages group
 my $group_error;
 my @packages_group;
-foreach my $group ([ map { { section => "", file => $_ } } @ARGV ], @$pre_packages) {
+foreach my $group ([ map { { section => "", file => $_ } } @ARGV ]) {
     my @packages;
     foreach my $opt (@$group) {
 	print "Preparing upload for $opt->{file} in $opt->{section}\n" if $verbose;
-- 
cgit v1.2.1