summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-25 14:57:05 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-25 14:57:05 +0000
commit4a62fb92b80fad9ba61cf0b4dd74fc5b03dcd94d (patch)
tree81200526fc7a0ed3d298322e1fbcbf1d1973701b /perl-install
parent474da8895db5db93cd95874506acb87eda9d1fbf (diff)
downloaddrakx-backup-do-not-use-4a62fb92b80fad9ba61cf0b4dd74fc5b03dcd94d.tar
drakx-backup-do-not-use-4a62fb92b80fad9ba61cf0b4dd74fc5b03dcd94d.tar.gz
drakx-backup-do-not-use-4a62fb92b80fad9ba61cf0b4dd74fc5b03dcd94d.tar.bz2
drakx-backup-do-not-use-4a62fb92b80fad9ba61cf0b4dd74fc5b03dcd94d.tar.xz
drakx-backup-do-not-use-4a62fb92b80fad9ba61cf0b4dd74fc5b03dcd94d.zip
no_comment
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ChangeLog6
-rw-r--r--perl-install/common.pm2
2 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 523967e70..774747810 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,5 +1,11 @@
2000-04-25 Pixel <pixel@mandrakesoft.com>
+ * lilo.pm (suggest): moved the generation of the keytable here. It
+ is used by both lilo & grub (lilo is not always installed as was
+ assumed)
+
+ * common.pm (formatAlaTeX): remove bounding spaces
+
* pkgs.pm (setSelectedFromCompssList): remove the hack for min
mark 25 in beginner
* install_steps_interactive.pm (choosePackages): set $min_mark to
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 4e368c058..9442e97f9 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -330,7 +330,7 @@ sub formatAlaTeX($) {
$t .= ($t && "\n") . $tmp;
$tmp = '';
} else {
- $tmp = ($tmp && "$tmp ") . $_;
+ $tmp = ($tmp && "$tmp ") . first(/^\s*(.*?)\s*$/);
}
}
$t . ($t && $tmp && "\n") . $tmp;