diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-01-18 13:52:00 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-01-18 13:52:00 +0000 |
| commit | f29cd86fbd748de5a623bd75b2f8ac320c5ce2b9 (patch) | |
| tree | ac68dd9ae9bc47815cd1b9ba53979dc25766280d | |
| parent | 7ee91f13918cdf5e69091006cd9f7197dc583284 (diff) | |
| download | drakx-f29cd86fbd748de5a623bd75b2f8ac320c5ce2b9.tar drakx-f29cd86fbd748de5a623bd75b2f8ac320c5ce2b9.tar.gz drakx-f29cd86fbd748de5a623bd75b2f8ac320c5ce2b9.tar.bz2 drakx-f29cd86fbd748de5a623bd75b2f8ac320c5ce2b9.tar.xz drakx-f29cd86fbd748de5a623bd75b2f8ac320c5ce2b9.zip | |
"my $foo if 0" semantic has changed in some cases, using the new "state" keyword instead
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 3 | ||||
| -rw-r--r-- | perl-install/mirror.pm | 3 | ||||
| -rw-r--r-- | perl-install/mygtk2.pm | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 097abc629..3a053723d 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- adapt to perl 5.10.0 + Version 10.6.5 - 14 January 2008 - drakboot: diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index fd68ee955..98cc80ac0 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -2,6 +2,7 @@ package install::steps_gtk; # $Id$ use diagnostics; use strict; +use feature 'state'; use vars qw(@ISA); @ISA = qw(install::steps_interactive interactive::gtk); @@ -474,7 +475,7 @@ sub installPackages { local $::noborderWhenEmbedded = 1; my $w = ugtk2->new(N("Installing"), icon => 'banner-sys'); - my $show_advertising if 0; + state $show_advertising; my $pkg_log_widget = gtknew('TextView', editable => 0); my ($advertising_image, $change_time, $i); diff --git a/perl-install/mirror.pm b/perl-install/mirror.pm index acd0cd02c..b61f24066 100644 --- a/perl-install/mirror.pm +++ b/perl-install/mirror.pm @@ -2,6 +2,7 @@ package mirror; # $Id$ use diagnostics; use strict; +use feature 'state'; use common; use log; @@ -86,7 +87,7 @@ sub list { my ($product_id, $type, $o_arch) = @_; our @mirrors_raw; - my $prev_arch if 0; + state $prev_arch; undef @mirrors_raw if $prev_arch ne $o_arch; $prev_arch = $o_arch || arch(); if (!@mirrors_raw) { diff --git a/perl-install/mygtk2.pm b/perl-install/mygtk2.pm index f218b4e66..f1b2acece 100644 --- a/perl-install/mygtk2.pm +++ b/perl-install/mygtk2.pm @@ -2,6 +2,7 @@ package mygtk2; use diagnostics; use strict; +use feature 'state'; our @ISA = qw(Exporter); our @EXPORT = qw(gtknew gtkset gtkadd gtkval_register gtkval_modify); @@ -1118,7 +1119,7 @@ sub may_destroy { } sub root_window() { - my $root if 0; + state $root; $root ||= Gtk2::Gdk->get_default_root_window; } |