diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2002-11-25 12:12:15 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2002-11-25 12:12:15 +0000 |
| commit | 4ae4f6417dfe3e4d9072b13a466884517e962126 (patch) | |
| tree | df97c3866b9081c83ba52313b876bff9c5cd0b8b | |
| parent | 08ca1e06eafd62d11f4d6dd97c09730997d5474c (diff) | |
| download | drakx-4ae4f6417dfe3e4d9072b13a466884517e962126.tar drakx-4ae4f6417dfe3e4d9072b13a466884517e962126.tar.gz drakx-4ae4f6417dfe3e4d9072b13a466884517e962126.tar.bz2 drakx-4ae4f6417dfe3e4d9072b13a466884517e962126.tar.xz drakx-4ae4f6417dfe3e4d9072b13a466884517e962126.zip | |
s/mdk_rel/mandrake_release/
| -rw-r--r-- | perl-install/common.pm | 6 | ||||
| -rwxr-xr-x | perl-install/standalone/drakbug | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/drakbug_report | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm index 31a1fcd12..37f53a1db 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -9,7 +9,7 @@ use vars qw(@ISA @EXPORT $SECTORSIZE); @ISA = qw(Exporter); # no need to export ``_'' -@EXPORT = qw($SECTORSIZE N N_ translate untranslate formatXiB removeXiBSuffix formatTime setVirtual makedev unmakedev salt set_permissions files_exist set_alternative); +@EXPORT = qw($SECTORSIZE N N_ translate untranslate formatXiB removeXiBSuffix formatTime setVirtual makedev unmakedev salt set_permissions files_exist set_alternative mandrake_release); # perl_checker: RE-EXPORT-ALL push @EXPORT, @MDK::Common::EXPORT; @@ -242,8 +242,8 @@ sub set_permissions { or die "Could not start chmod!"; } -sub mdk_rel { - chomp_(cat_("/etc/mandrake-release") +sub mandrake_release { + chomp_(cat_("/etc/mandrake-release")) } 1; diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug index d3e0df815..28d2472b4 100755 --- a/perl-install/standalone/drakbug +++ b/perl-install/standalone/drakbug @@ -86,7 +86,7 @@ $package->set_text("..."); $table->attach(my $kernel_rel = new Gtk::Entry(), 1, 2, 2, 3, 'fill', 'fill',0,0); $kernel_rel->set_text($kernel_release); $table->attach(my $mdk_rel = new Gtk::Entry(), 1, 2, 3, 4, 'fill', 'fill',0,0); -$mdk_rel->set_text(mdk_rel()); +$mdk_rel->set_text(mandrake_release()); gtkpack2__( gtkpack2__(my $vbx = new Gtk::VBox(0,5), @@ -167,7 +167,7 @@ sub get_package { } sub parse_release { - my ($rel) = mdk_rel() =~ /release\s(\S+\s\(.*\))/; + my ($rel) = mandrake_release() =~ /release\s(\S+\s\(.*\))/; $rel; } diff --git a/perl-install/standalone/drakbug_report b/perl-install/standalone/drakbug_report index 2f1abf662..ca947d4a3 100755 --- a/perl-install/standalone/drakbug_report +++ b/perl-install/standalone/drakbug_report @@ -7,7 +7,7 @@ use any; my %other = ( 'rpm -qa' => join('', sort `rpm -qa`), - 'mandrake version' => mdk_rel(), + 'mandrake version' => mandrake_release(), 'df' => join('', `df`), ); |