aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-06-23 13:54:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-06-23 13:54:13 +0000
commit6757fc3c4d1594c60b067834a2fbe0a4df31e967 (patch)
treedf11fdbe47c874177595484eaf9e171172798d31
parenta09597c65cda94b4eb606064e686d82fbc1cf069 (diff)
downloadmga-youri-core-6757fc3c4d1594c60b067834a2fbe0a4df31e967.tar
mga-youri-core-6757fc3c4d1594c60b067834a2fbe0a4df31e967.tar.gz
mga-youri-core-6757fc3c4d1594c60b067834a2fbe0a4df31e967.tar.bz2
mga-youri-core-6757fc3c4d1594c60b067834a2fbe0a4df31e967.tar.xz
mga-youri-core-6757fc3c4d1594c60b067834a2fbe0a4df31e967.zip
keep raw changelogs to avoid changing the format (backport)
-rw-r--r--lib/Youri/Package.pm3
-rw-r--r--lib/Youri/Package/RPM4.pm10
-rw-r--r--lib/Youri/Package/URPM.pm10
-rwxr-xr-xt/package.t32
4 files changed, 14 insertions, 41 deletions
diff --git a/lib/Youri/Package.pm b/lib/Youri/Package.pm
index c8a6bca..6b352c0 100644
--- a/lib/Youri/Package.pm
+++ b/lib/Youri/Package.pm
@@ -248,8 +248,7 @@ Time of the change (index CHANGE_TIME).
=item B<text>
-Textual description of the change, as as array reference of individual changes
-(index CHANGE_TEXT).
+Raw textual description of the change (index CHANGE_TEXT).
=back
diff --git a/lib/Youri/Package/RPM4.pm b/lib/Youri/Package/RPM4.pm
index 306c32f..b1ed5d8 100644
--- a/lib/Youri/Package/RPM4.pm
+++ b/lib/Youri/Package/RPM4.pm
@@ -339,10 +339,7 @@ sub get_changes {
$changes[$i] = [
$names[$i],
$time[$i],
- [
- map { s/^.\s+//; $_ }
- split(/\n/, $text[$i])
- ]
+ $text[$i],
];
}
@@ -355,10 +352,7 @@ sub get_last_change {
return [
($self->{_header}->tag('changelogname'))[0],
($self->{_header}->tag('changelogtime'))[0],
- [
- map { s/^.\s+//; $_ }
- split(/\n/, ($self->{_header}->tag('changelogtext'))[0])
- ]
+ ($self->{_header}->tag('changelogtext'))[0],
];
}
diff --git a/lib/Youri/Package/URPM.pm b/lib/Youri/Package/URPM.pm
index 5e314f9..d2b2360 100644
--- a/lib/Youri/Package/URPM.pm
+++ b/lib/Youri/Package/URPM.pm
@@ -307,10 +307,7 @@ sub get_changes {
$changes[$i] = [
$names[$i],
$time[$i],
- [
- map { s/^.\s+//; $_ }
- split(/\n/, $text[$i])
- ]
+ $text[$i],
];
}
@@ -323,10 +320,7 @@ sub get_last_change {
return [
($self->{_header}->changelog_name())[0],
($self->{_header}->changelog_time())[0],
- [
- map { s/^.\s+//; $_ }
- split(/\n/, ($self->{_header}->changelog_text())[0])
- ]
+ ($self->{_header}->changelog_text())[0],
];
}
diff --git a/t/package.t b/t/package.t
index 25e7798..f47e828 100755
--- a/t/package.t
+++ b/t/package.t
@@ -428,45 +428,33 @@ foreach my $class (@classes) {
[
'Guillaume Rousse <guillomovitch@mandriva.org> 3.03-11mdv2007.0',
1149847200,
- [
- '%mkrel',
- 'rpmbuildupdate aware'
- ]
+ '- %mkrel' . "\n" .
+ '- rpmbuildupdate aware',
],
[
'Guillaume Rousse <guillomovitch@mandriva.org> 3.03-10mdk ',
1117879200,
- [
- 'fix man page (fix #16291)'
- ]
+ '- fix man page (fix #16291)',
],
[
'Guillaume Rousse <guillomovitch@mandrake.org> 3.03-9mdk ',
1090058400,
- [
- 'hurry businesman compliant (aka two new wonderful cows)'
- ]
+ '- hurry businesman compliant (aka two new wonderful cows)',
],
[
'Guillaume Rousse <guillomovitch@mandrake.org> 3.03-8mdk ',
1089540000,
- [
- 'apologies to the girafes (with one only f)'
- ]
+ '- apologies to the girafes (with one only f)',
],
[
'Guillaume Rousse <guillomovitch@mandrake.org> 3.03-7mdk ',
1086429600,
- [
- '#mandrakefr compliant (aka four new additional cows)'
- ]
+ '- #mandrakefr compliant (aka four new additional cows)',
],
[
'Guillaume Rousse <guillomovitch@linux-mandrake.com> 3.03-6mdk',
1061460000,
- [
- 'save.the.world patch'
- ]
+ '- save.the.world patch',
]
],
'changelog'
@@ -476,10 +464,8 @@ foreach my $class (@classes) {
[
'Guillaume Rousse <guillomovitch@mandriva.org> 3.03-11mdv2007.0',
1149847200,
- [
- '%mkrel',
- 'rpmbuildupdate aware'
- ]
+ '- %mkrel' . "\n" .
+ '- rpmbuildupdate aware',
],
'last change'
);