Hello community, here is the log from the commit of package suseRegister checked in at Thu Jul 13 11:13:47 CEST 2006. -------- --- suseRegister/suseRegister.changes 2006-07-10 16:12:37.000000000 +0200 +++ suseRegister/suseRegister.changes 2006-07-13 09:46:41.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 13 09:21:54 CEST 2006 - mc@suse.de + +- add extra update sources feature (Feature #300728] +- set envVar LANGUAGE to en_US to get english command output + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.nnko2h/_old 2006-07-13 11:13:32.000000000 +0200 +++ /var/tmp/diff_new_pack.nnko2h/_new 2006-07-13 11:13:32.000000000 +0200 @@ -12,7 +12,7 @@ Name: suseRegister Version: 1.0 -Release: 64 +Release: 65 Summary: Registration tool Group: Productivity/Other License: GPL @@ -66,6 +66,9 @@ /usr/lib/suseRegister/bin/* %changelog -n suseRegister +* Thu Jul 13 2006 - mc@suse.de +- add extra update sources feature (Feature #300728] +- set envVar LANGUAGE to en_US to get english command output * Mon Jul 10 2006 - mc@suse.de - use Objects for XML parsing not the tree - detect FACTORY and exit with a special return code ++++++ suseRegister-1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.0/suseRegister.conf new/suseRegister-1.0/suseRegister.conf --- old/suseRegister-1.0/suseRegister.conf 2006-07-10 16:09:36.000000000 +0200 +++ new/suseRegister-1.0/suseRegister.conf 2006-07-13 09:24:06.000000000 +0200 @@ -3,3 +3,13 @@ register = command=register listProducts = command=listproducts #hostGUID = 122354 + +# add update sources provided by the registration server +# +addRegSrvSrc = true + +# add additional update sources (only type zypp is supported) +# addAdSrc can be used multiple times +# +#addAdSrc = http://you.suse.de/updates/test +#addAdSrc = http://you.suse.de/updates/test2 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.0/suse_register new/suseRegister-1.0/suse_register --- old/suseRegister-1.0/suse_register 2006-07-10 16:09:36.000000000 +0200 +++ new/suseRegister-1.0/suse_register 2006-07-13 09:24:06.000000000 +0200 @@ -101,6 +101,8 @@ my $rugzmdInstalled = 0; +my $addRegSrvSrc = 1; +my @addAdSrc = (); sub logPrintExit { @@ -236,6 +238,21 @@ { $hostGUID = $1; } + elsif($_ =~ /^addRegSrvSrc\s*=\s*(\w*)\s*/ && defined $1) + { + if(lc($1) eq "true") + { + $addRegSrvSrc = 1; + } + else + { + $addRegSrvSrc = 0; + } + } + elsif($_ =~ /^addAdSrc\s*=\s*(\S*)\s*/ && defined $1 && $1 ne "") + { + push @addAdSrc, $1; + } } close CNF; } @@ -1265,7 +1282,7 @@ return 0; } - $msg = `LANG=en_US $rug --terse --no-abbrev sl`; + $msg = `$rug --terse --no-abbrev sl`; $code = ($?>>8); if ($msg =~ /^---\sNo services found\s---/) @@ -1309,7 +1326,7 @@ return 0; } - $msg = `LANG=en_US $rug --terse ping`; + $msg = `$rug --terse ping`; $code = ($?>>8); foreach my $line (split("\n", $msg)) @@ -1707,8 +1724,18 @@ #print Data::Dumper->Dump([$tree]); - walkResultZmdconfig($tree); + if($addRegSrvSrc) + { + + walkResultZmdconfig($tree); + } + foreach my $src (@addAdSrc) + { + $zmdConfig->{$src}->{'url'} = $src; + $zmdConfig->{$src}->{'type'} = "zypp"; + } + print Data::Dumper->Dump([$zmdConfig]) if($debug >= 2); @@ -2316,7 +2343,15 @@ print STDERR "initialDomain: $initialDomain\n" if($debug); -if(exists $ENV{LANG} && $ENV{LANG} =~ /^([\w_]+)\./) +if(exists $ENV{LANG} && $ENV{LANG} =~ /^([\w_]+)\.?/) +{ + if(defined $1 && $1 ne "") + { + $lang = $1; + $lang =~ s/_/-/; + } +} +elsif(exists $ENV{LANGUAGE} && $ENV{LANGUAGE} =~ /^([\w_]+)\.?/) { if(defined $1 && $1 ne "") { @@ -2344,7 +2379,8 @@ print STDERR "lang: $lang\n" if($debug); # set LANG to en_US to get the error messages in english -$ENV{LANG} = "en_US"; +$ENV{LANG} = "en_US"; +$ENV{LANGUAGE} = "en_US"; listProducts(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de