aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2011-03-25 10:33:42 +0000
committerPascal Terjan <pterjan@mageia.org>2011-03-25 10:33:42 +0000
commit329303a9e34dcc3b9d44902b712821b738edc48d (patch)
tree68bf7765b12b62a4571c2282b0a27612c5793932
parented6a9183e6c78942dc11377c15366323ac08714f (diff)
downloadmga-youri-submit-329303a9e34dcc3b9d44902b712821b738edc48d.tar
mga-youri-submit-329303a9e34dcc3b9d44902b712821b738edc48d.tar.gz
mga-youri-submit-329303a9e34dcc3b9d44902b712821b738edc48d.tar.bz2
mga-youri-submit-329303a9e34dcc3b9d44902b712821b738edc48d.tar.xz
mga-youri-submit-329303a9e34dcc3b9d44902b712821b738edc48d.zip
Fix changelog mail content for new youri
-rw-r--r--lib/Youri/Submit/Action/Mail.pm17
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/Youri/Submit/Action/Mail.pm b/lib/Youri/Submit/Action/Mail.pm
index c9bbcbe..02e36cd 100644
--- a/lib/Youri/Submit/Action/Mail.pm
+++ b/lib/Youri/Submit/Action/Mail.pm
@@ -110,13 +110,24 @@ sub get_content {
my ($self, $package, $repository, $target, $define) = @_;
croak "Not a class method" unless ref $self;
- my $information = $package->get_information();
+ my $information = $package->as_formated_string(<<EOF);
+Name : %-27{NAME} Relocations: %|PREFIXES?{[%{PREFIXES} ]}:{(not relocatable)}|
+Version : %-27{VERSION} Vendor: %{VENDOR}
+Release : %-27{RELEASE} Build Date: %{BUILDTIME:date}
+Install Date: %|INSTALLTIME?{%-27{INSTALLTIME:date}}:{(not installed) }| Build Host: %{BUILDHOST}
+Group : %-27{GROUP} Source RPM: %{SOURCERPM}
+Size : %-27{SIZE}%|LICENSE?{ License: %{LICENSE}}|
+Signature : %|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|
+%|PACKAGER?{Packager : %{PACKAGER}\n}|%|URL?{URL : %{URL}\n}|Summary : %{SUMMARY}
+Description :\n%{DESCRIPTION}
+EOF
+
my $last_change = $package->get_last_change();
return
$information . "\n" .
- $last_change->[Youri::Package::CHANGE_AUTHOR] . ":\n" .
- $last_change->[Youri::Package::CHANGE_TEXT];
+ $last_change->get_author() . ":\n" .
+ $last_change->get_raw_text();
}