Hello community, here is the log from the commit of package suseRegister checked in at Tue May 9 19:14:54 CEST 2006. -------- --- suseRegister/suseRegister.changes 2006-05-04 17:25:34.000000000 +0200 +++ STABLE/suseRegister/suseRegister.changes 2006-05-09 14:56:42.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 9 12:43:04 CEST 2006 - mc@suse.de + +- add alias=<catalog-name> to URL for yast +- do not use rug register, use -k paramter in rug service-add + [fix parts of Bug #172336] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.DOvfTR/_old 2006-05-09 19:14:48.000000000 +0200 +++ /var/tmp/diff_new_pack.DOvfTR/_new 2006-05-09 19:14:48.000000000 +0200 @@ -13,7 +13,7 @@ Name: suseRegister BuildRequires: mono-core Version: 1.0 -Release: 58 +Release: 60 Summary: Registration tool Group: Productivity/Other License: GPL @@ -67,6 +67,10 @@ /usr/lib/suseRegister/bin/* %changelog -n suseRegister +* Tue May 09 2006 - mc@suse.de +- add alias=<catalog-name> to URL for yast +- do not use rug register, use -k paramter in rug service-add + [fix parts of Bug #172336] * Thu May 04 2006 - mc@suse.de - add support for type 'nu' [#172336] * Fri Apr 28 2006 - mc@suse.de ++++++ suseRegister-1.0.tar.bz2 ++++++ 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-05-04 16:40:37.000000000 +0200 +++ new/suseRegister-1.0/suse_register 2006-05-09 14:39:01.000000000 +0200 @@ -1268,11 +1268,11 @@ { return 0; } - + foreach my $line (split("\n", $msg)) { my($num, $stat, $type, $name, $uri) = split('\s*\|\s*', $line, 5); - print STDERR "Found $num, $stat, $type, $name, $uri\n" if($debug >= 2 && defined $num); + print STDERR "Found $num, $stat, $type, $name, $uri\n" if($debug >= 2 && defined $num && defined $stat); if(defined $name && $name ne "" && defined $num && $num ne "") @@ -1398,6 +1398,8 @@ my $url = shift || undef; my $type = shift || undef; my $id = shift || undef; + my $regcode = shift || undef; + my $msg = ""; my $t0 = [gettimeofday] if($time); @@ -1417,8 +1419,15 @@ $type = "zenworks"; } - my @rugArgs = ("--quiet", "sa", "--ignore-failure", "-t", "$type", "$url"); + my @rugArgs = ("--quiet", "sa", "--ignore-failure", "-t", "$type"); + + if(defined $regcode && $regcode ne "") + { + push @rugArgs, "-k", "$regcode"; + } + push @rugArgs, "$url"; + if(defined $id) { foreach my $num (keys %availableSources) @@ -1658,7 +1667,7 @@ walkResultZmdconfig($tree); - #print Data::Dumper->Dump([$zmdConfig]); + print Data::Dumper->Dump([$zmdConfig]) if($debug >= 2); # HACK: write urls for yast @@ -1693,8 +1702,8 @@ my $curi = URI->new($zmdConfig->{$service}->{catalog}->{$u}); print $curi->as_string."\n"; $curi->userinfo("$guid:$secret"); - $curi->query("auth=digest"); - + $curi->query_form(auth => "digest", alias => $u); + print XMLD $curi->as_string."\n"; syslog("info", "dumpfile write(nu):".$u); } @@ -1758,24 +1767,27 @@ ($ret, $msg) = rugServiceAdd($zmdConfig->{$service}->{url}, $zmdConfig->{$service}->{type}, - $name); + $name, $zmdConfig->{$service}->{regcode}); if ($ret != 0) { logPrintExit($msg, $ret); } - - if($zmdConfig->{$service}->{type} eq "zenworks" || - $zmdConfig->{$service}->{type} eq "nu") - { - ($ret, $msg) = rugRegister($zmdConfig->{$service}->{url}, - $zmdConfig->{$service}->{regcode}); - - if ($ret != 0) - { - logPrintExit($msg, $ret); - } - } + +############################################################## +### we register now in rugServiceAdd +############################################################## +# if($zmdConfig->{$service}->{type} eq "zenworks" || +# $zmdConfig->{$service}->{type} eq "nu") +# { +# ($ret, $msg) = rugRegister($zmdConfig->{$service}->{url}, +# $zmdConfig->{$service}->{regcode}); +# +# if ($ret != 0) +# { +# logPrintExit($msg, $ret); +# } +# } ($ret, $msg) = rugSubscribe($catalogs); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...