Delete file when installed; include section in the mail subject; move debug package to debug; add function to find main section, only compare package which main section is different (packages can be duplicate in main/release and main/testing

1 files changed, 27 insertions, 4 deletions

diff --git a/lib/Youri/Repository/Mandriva_upload.pm b/lib/Youri/Repository/Mandriva_upload.pm
index 5f48a10..f2dd1d9 100644
--- a/lib/Youri/Repository/Mandriva_upload.pm
+++ b/lib/Youri/Repository/Mandriva_upload.pm
@@ -77,15 +77,14 @@ sub _get_media_config {
 	    my $debug_for = $distrib->getvalue($media, 'debug_for');
 	    my $srpms = $distrib->getvalue($media, 'srpms');
 	    my $path = $distrib->getfullpath($media, 'path');
-	    if (!$debug_for && !$rpms) {
+	    if (!$rpms) {
 		if (-d $path) {
 		    print "MEDIA defining $media in $path\n" if $self->{_verbose};
 		    $media{$arch}{$media} = $path
 		} else {
 		    print "ERROR $path does not exist for media $media on $arch\n"
 		}
-	    }
-	    if ($rpms) {
+	    } else {
 		my ($media) = split ' ', $rpms;
 		if (-d $path) {
 		    print "MEDIA defining SOURCE media for $media in $path\n" if $self->{_verbose};
@@ -198,6 +197,14 @@ sub get_replaced_packages {
        
 }
 
+sub _get_main_section {
+    my ($self, $package, $target, $define) = @_;
+
+    my $section = $self->_get_section($package, $target, $define);
+    my ($main_section) = $section =~ m,^([^/]+),;
+    $main_section
+}
+
 sub _get_section {
     my ($self, $package, $target, $define) = @_;
 
@@ -210,7 +217,7 @@ sub _get_section {
 	$section = $package->_get_section()
     }
     if ($package->is_debug()) {
-	$section = "${debug}_$section"
+	$section = "debug_$section"
     }
 
     # if section is provided, check this one is defined
@@ -344,6 +351,22 @@ sub get_revisions {
         @packages;
 }
 
+sub reject {
+    my ($self, $package, $target, $define) = @_;
+    croak "Not a class method" unless ref $self;
+
+
+}
+
+sub get_archive_dir {
+    my ($self, $package, $target, $define) = @_;
+    croak "Not a class method" unless ref $self;
+
+    return
+        $self->{_archive_root}
+}
+
+
 # 20060801 warly
 #
 # Upload steps