spacewalk-commits February 2011

spacewalk-commits@lists.fedorahosted.org

9 participants
356 discussions

monitoring/PerlModules
by Jan Pazdziora 18 Feb '11

18 Feb '11

monitoring/PerlModules/NP/Probe/DataSource/NetstatOutput.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit dba7dff8da2f2751f52d0612b74bf127d214c1ab Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 10:46:16 2011 +0100 Changing array with map is ugly, we shall use for instead. diff --git a/monitoring/PerlModules/NP/Probe/DataSource/NetstatOutput.pm b/monitoring/PerlModules/NP/Probe/DataSource/NetstatOutput.pm index be95ca9..8782c3b 100644 --- a/monitoring/PerlModules/NP/Probe/DataSource/NetstatOutput.pm +++ b/monitoring/PerlModules/NP/Probe/DataSource/NetstatOutput.pm @@ -187,7 +187,9 @@ sub split_ip { ($octets[0], $octets[1], $octets[2], $octets[3], $port) = split($regex, $field); # Set empty octets to wildcard - map { $_ = '*' unless defined($_) } @octets; + for (@octets) { + $_ = '*' unless defined($_); + } return (\@octets, $port); }

1 0

monitoring/PerlModules
by Jan Pazdziora 18 Feb '11

18 Feb '11

monitoring/PerlModules/NP/Debug/Debug.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 4ba71014874ec71642788141d91cf1d29fd5f324 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 10:40:41 2011 +0100 Use three-parameter opens. diff --git a/monitoring/PerlModules/NP/Debug/Debug.pm b/monitoring/PerlModules/NP/Debug/Debug.pm index 2196d09..e50d462 100644 --- a/monitoring/PerlModules/NP/Debug/Debug.pm +++ b/monitoring/PerlModules/NP/Debug/Debug.pm @@ -88,8 +88,7 @@ sub addstream { # Assume fh is a filename ($filename) = $fh =~ /(.*)/; - ($append) = $append =~ /(.*)/; - unless (open($newfh, "$append $filename")) { + unless (open($newfh, $append, $filename)) { $@ = "Can't write to file '$filename': $!"; return undef; } @@ -534,7 +533,7 @@ sub rotate { # Reopen the file my $append = $self->append; - unless (open($self->fh, "$append $oldname")) { + unless (open($self->fh, $append, $oldname)) { $@ = "Can't create file '$oldname': $!"; return undef; }

1 0

monitoring/PerlModules
by Jan Pazdziora 18 Feb '11

18 Feb '11

monitoring/PerlModules/NP/ProcessPool/Process.pm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) New commits: commit a54bc8d1ef83a951e8e945f11ca2d203b52311bf Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 10:37:10 2011 +0100 Localize the filehandle globs; also use three-parameter opens. diff --git a/monitoring/PerlModules/NP/ProcessPool/Process.pm b/monitoring/PerlModules/NP/ProcessPool/Process.pm index 3da3a95..ba18a9d 100644 --- a/monitoring/PerlModules/NP/ProcessPool/Process.pm +++ b/monitoring/PerlModules/NP/ProcessPool/Process.pm @@ -108,10 +108,12 @@ sub spawn { my $f; $f = sprintf($stdout, $$); - open(STDOUT, ">$f") or die "Couldn't create $f: $!"; + local * STDOUT; + open(STDOUT, '>', $f) or die "Couldn't create $f: $!"; $f = sprintf($stderr, $$); - open(STDERR, ">>$f") or die "Couldn't create $f: $!"; + local * STDERR; + open(STDERR, '>>', $f) or die "Couldn't create $f: $!"; # Execute the command @@ -127,7 +129,8 @@ sub spawn { # Print the returned object to the rvfile my $frozen = freeze($return); $f = sprintf($retval, $$); - open(RV, ">$f") or die "Couldn't create $f: $!"; + local * RV; + open(RV, '>', $f) or die "Couldn't create $f: $!"; print RV $frozen; close(RV); @@ -176,7 +179,8 @@ sub file_contents { # Read the file if cleanup has not been called yet. if (defined($file)) { $self->dprint(4, "\t$label: Fetching from ", $file, "\n"); - open(FILE, $file); + local * FILE; + open(FILE, '<', $file); $contents = join('', <FILE>); close(FILE); }

1 0

monitoring/NPalert
by Jan Pazdziora 18 Feb '11

18 Feb '11

monitoring/NPalert/AlertFile.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 166cc1ed95140cd4fef35604786c26f4bb083ec8 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 10:34:38 2011 +0100 Localize the filehandle globs; also use three-parameter opens. diff --git a/monitoring/NPalert/AlertFile.pm b/monitoring/NPalert/AlertFile.pm index 5234036..ba7de12 100644 --- a/monitoring/NPalert/AlertFile.pm +++ b/monitoring/NPalert/AlertFile.pm @@ -47,7 +47,8 @@ sub remove_locks { foreach my $f (@files) { $Log->log(9,"lock file: $f\n"); - open(FILE,"< $f"); + local * FILE; + open(FILE, '<', $f); my @contents=<FILE>; close(FILE); my $content=join('',@contents); @@ -100,7 +101,8 @@ sub acquire_lock { if (-e $lockfile) { - open(FILE,$lockfile); + local * FILE; + open(FILE, '<', $lockfile); my @lines=<FILE>; close(FILE); my $err= "$$ Unable to acquire lock on " . $self->file . " " . @@ -109,7 +111,8 @@ sub acquire_lock { warn $err; return undef; } else { - unless (open(LOCK,">$lockfile")) { + local * LOCK; + unless (open(LOCK, '>', $lockfile)) { my $msg = "Unable to open lock on " . $self->file; $Log->log(1,"FATAL ERROR: $msg"); print STDERR "FATAL ERROR: AlertFile->acquire_lock $msg";

1 0

4 commits - monitoring/NPalert
by Jan Pazdziora 18 Feb '11

18 Feb '11

monitoring/NPalert/Acknowledgement.pm | 3 ++- monitoring/NPalert/NotificationIni.pm | 3 ++- monitoring/NPalert/test/TestAcknowledgement.pm | 3 ++- monitoring/NPalert/test/TestNotificationIni.pm | 6 ++++-- 4 files changed, 10 insertions(+), 5 deletions(-) New commits: commit d61bdd640f0c397f3fd54387844188bf0a8c245a Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 10:32:23 2011 +0100 Localize the FILE; also use three-parameter open. diff --git a/monitoring/NPalert/test/TestNotificationIni.pm b/monitoring/NPalert/test/TestNotificationIni.pm index 596bd8d..22ce727 100644 --- a/monitoring/NPalert/test/TestNotificationIni.pm +++ b/monitoring/NPalert/test/TestNotificationIni.pm @@ -63,7 +63,8 @@ sub test_create_file { $self->{'blah'}->create_file($arrayptr, 'RECID', 'NAME', 'TITLE'); - open(FILE, $file) || die; + local * FILE; + open(FILE, '<', $file) || die; my @result_array = <FILE>; close(FILE) || die; @@ -195,7 +196,8 @@ name=Garcia title=Sargent EOT - open(FILE, "> $file"); + local * FILE; + open(FILE, '>', $file); print FILE $data; close FILE; commit e56c6cb0517c5c2c5c035652b958bb83d799eead Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 10:30:53 2011 +0100 Localize the FILE; also use three-parameter open. diff --git a/monitoring/NPalert/test/TestAcknowledgement.pm b/monitoring/NPalert/test/TestAcknowledgement.pm index 14178f4..c2c3bf3 100644 --- a/monitoring/NPalert/test/TestAcknowledgement.pm +++ b/monitoring/NPalert/test/TestAcknowledgement.pm @@ -522,7 +522,8 @@ sub set_up { mkdir ($directory,0777); foreach (@files) { - open(FILE,">> $directory/$_"); + local * FILE; + open(FILE, '>>', "$directory/$_"); print FILE $$_; close(FILE); $self->{$_}=$MODULE->from_file("$directory/$_"); commit 948cd2d383dd0a7536b603d1fd4c49878e7dd4a0 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 10:29:31 2011 +0100 Localize the FILE; also use three-parameter open. diff --git a/monitoring/NPalert/NotificationIni.pm b/monitoring/NPalert/NotificationIni.pm index 4db236d..4bf7460 100644 --- a/monitoring/NPalert/NotificationIni.pm +++ b/monitoring/NPalert/NotificationIni.pm @@ -16,7 +16,8 @@ sub create_file { $arrayptr = \values(%$arrayptr); } - open(FILE, "> " . $self->file_name()) + local * FILE; + open(FILE, '>', $self->file_name()) || die("Unable to open file" . $self->file_name()); unless (@fields_to_include) { commit 98bdf6990559e15887bd715f7216273ea5d78cb4 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 10:12:12 2011 +0100 Localize the FILE; also use three-parameter open. diff --git a/monitoring/NPalert/Acknowledgement.pm b/monitoring/NPalert/Acknowledgement.pm index bbcb09e..6c7c3e4 100644 --- a/monitoring/NPalert/Acknowledgement.pm +++ b/monitoring/NPalert/Acknowledgement.pm @@ -50,7 +50,8 @@ sub from_file { # Create a Mail::Internet object from the email file $Log->log(9,"opening $filename\n"); - unless (open(FILE,"< $filename")) { + local * FILE; + unless (open(FILE, '<', $filename)) { $Log->log(1,"unable to open '$filename'\n"); return undef }

1 0

spacewalk/setup
by Jan Pazdziora 18 Feb '11

18 Feb '11

spacewalk/setup/lib/Spacewalk/Setup.pm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) New commits: commit 70f72e87d6df7e5deab1777c3031c6ce0730d121 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 10:10:12 2011 +0100 Localize globs used for filehandles; use three-parameter opens. diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index 89b6e6a..8a64a5c 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -141,7 +141,8 @@ sub loc { sub read_config { my $config_file = shift; my $options = shift; - open(CONFIG, "< $config_file") or die "Could not open $config_file: $!"; + local * CONFIG; + open(CONFIG, '<', $config_file) or die "Could not open $config_file: $!"; while (my $line = <CONFIG>) { if ($line =~ /^#/ or $line =~ /\[comment\]/ or $line =~ "^\n") { @@ -173,7 +174,8 @@ sub load_answer_file { if ($options->{'answer-file'} and $file eq $options->{'answer-file'}) { print loc("* Loading answer file: %s.\n", $file); } - open FH, $file or die loc("Could not open answer file: %s\n", $!); + local * FH; + open FH, '<', $file or die loc("Could not open answer file: %s\n", $!); while (my $line = <FH>) { next if substr($line, 0, 1) eq '#'; @@ -353,12 +355,13 @@ sub init_log_files { log_rotate(INSTALL_LOG_FILE); if (have_selinux()) { - local *X; open X, '> ' . INSTALL_LOG_FILE and close X; + local *X; open X, '>', INSTALL_LOG_FILE and close X; system('/sbin/restorecon', INSTALL_LOG_FILE); } log_rotate(DB_INSTALL_LOG_FILE); log_rotate(DB_POP_LOG_FILE); + local * FH; open(FH, ">", INSTALL_LOG_FILE) or die "Could not open '" . INSTALL_LOG_FILE . "': $!"; @@ -1130,7 +1133,7 @@ EOQ EOQ if (have_selinux()) { - local *X; open X, '> ' . DB_INSTALL_LOG_FILE and close X; + local *X; open X, '>', DB_INSTALL_LOG_FILE and close X; system('/sbin/restorecon', DB_INSTALL_LOG_FILE); } print_progress(-init_message => "*** Progress: #", @@ -1397,7 +1400,7 @@ sub oracle_populate_db { my @opts = ('spacewalk-sql', '--select-mode-direct', $sat_schema_deploy); if (have_selinux()) { - local *X; open X, '> ' . DB_POP_LOG_FILE and close X; + local *X; open X, '>', DB_POP_LOG_FILE and close X; system('/sbin/restorecon', DB_POP_LOG_FILE); } print_progress(-init_message => "*** Progress: #", @@ -1580,7 +1583,8 @@ sub generate_server_pem { my $opts = join(' ', @opts); my $content; - open(FH, "/usr/bin/rhn-generate-pem.pl $opts |") + local * FH; + open(FH, '-|', "/usr/bin/rhn-generate-pem.pl $opts") or die "Could not generate server.pem file: $OS_ERROR"; my @content = <FH>;

1 0

2 commits - web/modules
by Jan Pazdziora 18 Feb '11

18 Feb '11

web/modules/dobby/Dobby/BackupLog.pm | 6 ++++-- web/modules/dobby/Dobby/Files.pm | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) New commits: commit 854378c2a4820f685788d0e1820b95afc8240914 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 10:04:26 2011 +0100 Localize the FH; also use three-parameter open. diff --git a/web/modules/dobby/Dobby/BackupLog.pm b/web/modules/dobby/Dobby/BackupLog.pm index 4b8d039..945f65e 100644 --- a/web/modules/dobby/Dobby/BackupLog.pm +++ b/web/modules/dobby/Dobby/BackupLog.pm @@ -37,7 +37,8 @@ sub parse { eval { $doc = $parser->parse_file($restore_log); }; if ($@) { - open FH, "<$restore_log" or die "open $restore_log: $!"; + local * FH; + open FH, '<', $restore_log or die "open $restore_log: $!"; my $contents = join("", <FH>); close FH; $log = thaw($contents); @@ -149,7 +150,8 @@ sub serialize { my $self = shift; my $dest = shift; - open FH, ">$dest" or die "open $dest: $!"; + local * FH; + open FH, '>', $dest or die "open $dest: $!"; print FH $self->toXml(); close FH; } commit 44c698cce70570fc3b5ce5de09aa1243d279228c Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 10:03:15 2011 +0100 Localize IN and OUT; also use three-parameter open. diff --git a/web/modules/dobby/Dobby/Files.pm b/web/modules/dobby/Dobby/Files.pm index 577a0d2..8986927 100644 --- a/web/modules/dobby/Dobby/Files.pm +++ b/web/modules/dobby/Dobby/Files.pm @@ -27,7 +27,8 @@ sub gzip_copy { my $src = shift; my $dst = shift; - open IN, "<$src" or die "open $src: $!\n"; + local * IN; + open IN, '<', $src or die "open $src: $!\n"; my $gz = gzopen("$dst", "wb") or die "gzopen: $!\n"; my $ctx = new Digest::MD5; @@ -53,8 +54,9 @@ sub gunzip_copy { my $dst = shift; my $write; + local * OUT; if ($dst) { - open OUT, ">$dst" or die "open $dst: $!\n"; + open OUT, '>', $dst or die "open $dst: $!\n"; $write = 1 } else {

1 0

web/modules
by Jan Pazdziora 18 Feb '11

18 Feb '11

web/modules/pxt/PXT/Utils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 603e60a69723437aa6a989f646c1a7160800dec8 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 10:01:26 2011 +0100 Localize the RANDOM; also use three-parameter open. diff --git a/web/modules/pxt/PXT/Utils.pm b/web/modules/pxt/PXT/Utils.pm index 3a6b293..5b29446 100644 --- a/web/modules/pxt/PXT/Utils.pm +++ b/web/modules/pxt/PXT/Utils.pm @@ -272,7 +272,8 @@ sub random_bits { my $class = shift; my $n = shift; - open(RANDOM, '/dev/urandom') or die 'could not open /dev/urandom for reading!'; + local * RANDOM; + open(RANDOM, '<', '/dev/urandom') or die 'could not open /dev/urandom for reading!'; binmode(RANDOM); my $rand_data; my $result = read(RANDOM, $rand_data, $n >> 3);

1 0

web/modules
by Jan Pazdziora 18 Feb '11

18 Feb '11

web/modules/pxt/PXT/Config.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit fa6a733377357be71bb6744064a615c98172293e Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 10:00:33 2011 +0100 Localize the FH; also use three-parameter open. diff --git a/web/modules/pxt/PXT/Config.pm b/web/modules/pxt/PXT/Config.pm index b323c1e..fdb4a2a 100644 --- a/web/modules/pxt/PXT/Config.pm +++ b/web/modules/pxt/PXT/Config.pm @@ -67,7 +67,8 @@ sub load_file { my $self = ref $class ? $class : $class->default_config(); my %params = validate(@_, { -filename => 1, -mode => 1 }); - open FH, "<$params{-filename}" + local * FH; + open FH, '<', $params{-filename} or die "Can't open config file '$params{-filename}': $!"; while(<FH>) {

1 0

2 commits - web/modules
by Jan Pazdziora 18 Feb '11

18 Feb '11

web/modules/pxt/PXT/ApacheHandler.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 989f242ba10c27d3c6db93b339944662f826d4e0 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 09:59:36 2011 +0100 Localize the MYFILE; also use three-parameter open. diff --git a/web/modules/pxt/PXT/ApacheHandler.pm b/web/modules/pxt/PXT/ApacheHandler.pm index 9388731..7796b0e 100644 --- a/web/modules/pxt/PXT/ApacheHandler.pm +++ b/web/modules/pxt/PXT/ApacheHandler.pm @@ -444,7 +444,8 @@ sub _read_file { #my $root = $self->document_root(); - if (not open MYFILE, ("$root/$file")) { + local * MYFILE; + if (not open MYFILE, '<', "$root/$file") { Carp::cluck "Couldn't open file: $root/$file ($!)"; return ''; } commit e8014adc37fbf39b3fbf9aae2f6d2166ec0419c4 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Feb 18 09:59:01 2011 +0100 Localize the FH; also use three-parameter open. diff --git a/web/modules/pxt/PXT/ApacheHandler.pm b/web/modules/pxt/PXT/ApacheHandler.pm index d09f10b..9388731 100644 --- a/web/modules/pxt/PXT/ApacheHandler.pm +++ b/web/modules/pxt/PXT/ApacheHandler.pm @@ -219,8 +219,9 @@ sub load_pxt_file { } } + local * FH; unless ($use_cache) { - open FH, ("<" . $filename) or return; + open FH, '<', $filename or return; } local $/ = undef;

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits February 2011