Author: jdsn Date: Thu Oct 8 20:17:55 2009 New Revision: 58985 URL: http://svn.opensuse.org/viewcvs/yast?rev=58985&view=rev Log: fix latest changes Modified: trunk/registration/src/modules/YSR.pm_web Modified: trunk/registration/src/modules/YSR.pm_web URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/YSR.pm_web?rev=58985&r1=58984&r2=58985&view=diff ============================================================================== --- trunk/registration/src/modules/YSR.pm_web (original) +++ trunk/registration/src/modules/YSR.pm_web Thu Oct 8 20:17:55 2009 @@ -187,7 +187,7 @@ { my $self = shift; my $args = shift; - +printf "FOOOOOOOOOOOOOOOOOOOOOOOOOOOOOBAR\n"; #return { 'msg' => '4711' }; unless ( defined $args && ref($args) eq "HASH" ) @@ -242,32 +242,36 @@ sub get_registrationConfig { my $self = shift; - my $SRconf = '/etc/suseRegister.conf' - my $SRcert = '/etc/ssl/certs/registration-server.pem' + my $SRconf = '/etc/suseRegister.conf'; + my $SRcert = '/etc/ssl/certs/registration-server.pem'; my $url = undef; my $cert = undef; if ( -e $SRconf ) { - open(CNF, "< $SRconf") || $url = undef; - while(<CNF>) + if (open(CNF, "< $SRconf") ) { - next if($_ =~ /^\s*#/); + while(<CNF>) + { + next if($_ =~ /^\s*#/); - if($_ =~ /^url\s*=\s*(\S*)\s*/ && defined $1 && $1 ne '') - { $url = $1; } + if($_ =~ /^url\s*=\s*(\S*)\s*/ && defined $1 && $1 ne '') + { $url = $1; } + } + close CNF; } - close CNF; } if ( -e $SRcert ) { my $separator = $/; local $/ = undef; - open(CERT, "< $SRcert") || $cert = undef; - $cert = <CERT>; - close CERT; + if ( open(CERT, "< $SRcert") ) + { + $cert = <CERT>; + close CERT; + } $/ = $separator; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org