From 456bb2657b2c04fecad6210852be15582c443d48 Mon Sep 17 00:00:00 2001
From: Gustavo De Nardin <spuk@mandriva.org>
Date: Mon, 21 May 2007 15:09:19 +0000
Subject: get_repsys_conf() didn't really got Repsys config, just emails from
 the static file. Changed it for get_author_email(), which uses repsys command
 itself to get the email. Should fix bug #30904.

---
 ulri | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'ulri')

diff --git a/ulri b/ulri
index a499759..80b67a1 100755
--- a/ulri
+++ b/ulri
@@ -33,7 +33,7 @@
 
 use strict;
 use MDK::Common;
-use Iurt::Config qw(config_usage get_date config_init dump_cache init_cache get_repsys_conf check_arch check_noarch);
+use Iurt::Config qw(config_usage get_date config_init dump_cache init_cache get_author_email check_arch check_noarch);
 use Iurt::Process qw(check_pid);
 use Iurt::File qw(check_upload_tree);
 use Iurt::Mail qw(sendmail);
@@ -122,6 +122,7 @@ my %config_usage = (
 	    },
 	},
     },
+    # this is weird to me, guessing email addresses? -spuk
     default_mail_domain => {
 	desc => "Default mail domain to append",
 	default => 'mandriva.org'
@@ -142,10 +143,6 @@ my %config_usage = (
 	desc => 'Where to store the cache files',
 	default => "$HOME/.bugs"
     },
-    repsys_conf => {
-	desc => 'Path of repsys.conf which includes login mail corresponding',
-	default => '/etc/repsys.conf'
-    },
     tmp => {
        desc => "Temporary directory",
        default => "$HOME/tmp/"
@@ -168,8 +165,6 @@ foreach my $k (keys %{$config->{arch_translation}}) {
     push @{$untranslated_arch{$v}}, $k;
 }
 
-my $mail = get_repsys_conf($config->{repsys_conf});
-
 $run{pidfile_home} = $config->{tmp};
 $run{pidfile} = "upload";
 my $pidfile = check_pid(\%run);
@@ -493,7 +488,7 @@ foreach my $prefix (keys %pkg_tree) {
 		$text .= "- $srpm\n";
 	    }
 
-	    my $to = $mail->{$user} || "$user\@$config->{default_mail_domain}";
+	    my $to = get_author_email($user) || "$user\@$config->{default_mail_domain}";
 	    my $fpath = "$config->{http_queue}/failure/$path/$prefix";
 	    $fpath =~ tr!/!!s;	# Squash double slashes ...
 	    $fpath =~ s!/!//!;	# ... except for http://
@@ -530,7 +525,7 @@ foreach my $prefix (sort keys %pkg_tree) {
     my $srpms = $ent->{srpms} or next;
     my $user = $ent->{user};
     if ($user) {
-	$user = $mail->{$user} || $config->{packager}
+	$user = get_author_email($user) || $config->{packager};
     } else {
 	$user = $config->{packager}
     }
-- 
cgit v1.2.1