diff options
Diffstat (limited to 'perl-install/common.pm')
| -rw-r--r-- | perl-install/common.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm index 3eb223cd5..2806e1103 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -1,4 +1,4 @@ -package common; # $Id$ +package common; # $Id: common.pm 245955 2008-09-18 14:19:04Z pixel $ use MDK::Common; use diagnostics; @@ -10,7 +10,7 @@ use run_program; use Exporter; our @ISA = qw(Exporter); -our @EXPORT = qw($SECTORSIZE N P N_ check_for_xserver files_exist formatTime MB formatXiB get_parent_uid is_running makedev mandrake_release mandrake_release_info removeXiBSuffix require_root_capability setVirtual set_alternative set_l10n_sort set_permissions to_utf8 translate unmakedev); +our @EXPORT = qw($SECTORSIZE N P N_ check_for_xserver files_exist formatTime MB formatXiB get_parent_uid is_running makedev mageia_release mageia_release_info removeXiBSuffix require_root_capability setVirtual set_alternative set_l10n_sort set_permissions to_utf8 translate unmakedev); # perl_checker: RE-EXPORT-ALL push @EXPORT, @MDK::Common::EXPORT; @@ -344,14 +344,14 @@ sub parse_release_file { sub release_file { my ($o_dir) = @_; - my @names = ('mandrakelinux-release', 'mandrake-release', 'conectiva-release', 'release', 'redhat-release', 'fedora-release', 'SuSE-release'); + my @names = ('mageia-release', 'mandrakelinux-release', 'mandrake-release', 'conectiva-release', 'release', 'redhat-release', 'fedora-release', 'SuSE-release'); find { -r "$o_dir$_" } ( (map { "/root/drakx/$_.upgrading" } @names), (map { "/etc/$_" } @names), ); } -sub mandrake_release_info() { +sub mageia_release_info() { parse_LDAP_namespace_structure(cat_('/etc/product.id')); } @@ -361,7 +361,7 @@ sub parse_LDAP_namespace_structure { \%h; } -sub mandrake_release { +sub mageia_release { my ($o_dir) = @_; my $f = release_file($o_dir); $f && chomp_(cat_("$o_dir$f")); |