Hello community, here is the log from the commit of package suseRegister checked in at Wed Apr 2 20:32:36 CEST 2008. -------- --- suseRegister/suseRegister.changes 2008-02-15 13:54:10.000000000 +0100 +++ suseRegister/suseRegister.changes 2008-04-01 17:27:19.716050000 +0200 @@ -1,0 +2,9 @@ +Tue Apr 1 17:24:04 CEST 2008 - mc@suse.de + +- Require uuid-runtime +- fix running with zypper +- write allowFile only if rug and zmd are installed +- implement workaround for ostarget-bak if lsb_release is + not available + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.kG3490/_old 2008-04-02 20:31:57.000000000 +0200 +++ /var/tmp/diff_new_pack.kG3490/_new 2008-04-02 20:31:57.000000000 +0200 @@ -13,7 +13,7 @@ Name: suseRegister Version: 1.2 -Release: 97 +Release: 106 Summary: Registration Tool Group: Productivity/Other License: GPL v2 or later @@ -26,7 +26,7 @@ Requires: perl-XML-Parser Requires: perl-XML-Writer Requires: perl-URI -Requires: /usr/bin/uuidgen +Requires: uuid-runtime Requires: coreutils Requires: sysconfig Requires: hwinfo @@ -92,6 +92,12 @@ %endif %changelog +* Tue Apr 01 2008 mc@suse.de +- Require uuid-runtime +- fix running with zypper +- write allowFile only if rug and zmd are installed +- implement workaround for ostarget-bak if lsb_release is + not available * Fri Feb 15 2008 mc@suse.de - set cache-max-size-in-mb to unlimited before calling rug refresh. Reset to old value after refresh is finished ++++++ suseRegister-1.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.2/SRPrivate.pm new/suseRegister-1.2/SRPrivate.pm --- old/suseRegister-1.2/SRPrivate.pm 2008-02-15 13:27:35.000000000 +0100 +++ new/suseRegister-1.2/SRPrivate.pm 2008-04-01 17:19:24.000000000 +0200 @@ -299,6 +299,26 @@ @arguments = split(/\s+/, $1); } } + elsif($1 eq "-sd") + { + # needed for ostarget-bak; + # we should be able to return this even without lsb package installed. + my $line = ""; + open(SR, "< /etc/SuSE-release") and do { + + $line = <SR>; + chomp($line); + $line =~ s/^\s*//; + $line =~ s/\s*$//; + close SR; + }; + + if($line ne "") + { + return '"'.$line.'"'; + } + return ""; + } else { return ""; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.2/suse_register new/suseRegister-1.2/suse_register --- old/suseRegister-1.2/suse_register 2008-02-15 13:27:35.000000000 +0100 +++ new/suseRegister-1.2/suse_register 2008-04-01 17:19:24.000000000 +0200 @@ -238,7 +238,7 @@ logPrintExit($ctx, $ctx->{errormsg}, $ctx->{errorcode}); } -if($batch && $registerinpatch && !$listParams) +if($batch && $registerinpatch && !$listParams && $ctx->{rugzmdInstalled}) { open(ALLOWFILE, "> $zmdallowfile") or logPrintExit($ctx, "Cannot open zmd allow file: $!", 12); print ALLOWFILE ""; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.2/SuseRegister.pm new/suseRegister-1.2/SuseRegister.pm --- old/suseRegister-1.2/SuseRegister.pm 2008-02-15 13:27:35.000000000 +0100 +++ new/suseRegister-1.2/SuseRegister.pm 2008-04-01 17:19:24.000000000 +0200 @@ -1221,6 +1221,54 @@ } } + if(!$ctx->{rugzmdInstalled}) + { + # zypp does not support type NU, so we have to convert returned zmdconfig + # with zype NU to simple zypp type + + my $RWlastZmdConfig = {}; + + foreach my $service (keys %{$ctx->{lastZmdConfig}}) + { + if(lc($ctx->{lastZmdConfig}->{$service}->{type}) eq "nu") + { + foreach my $catname (keys %{$ctx->{lastZmdConfig}->{$service}->{catalog}}) + { + $RWlastZmdConfig->{$ctx->{lastZmdConfig}->{$service}->{catalog}->{$catname}->{url}}->{url} = $ctx->{lastZmdConfig}->{$service}->{catalog}->{$catname}->{url}; + $RWlastZmdConfig->{$ctx->{lastZmdConfig}->{$service}->{catalog}->{$catname}->{url}}->{type} = 'zypp'; + $RWlastZmdConfig->{$ctx->{lastZmdConfig}->{$service}->{catalog}->{$catname}->{url}}->{alias} = $catname; + } + } + else + { + SUSE::SRPrivate::copyService($ctx->{lastZmdConfig}->{$service}, $RWlastZmdConfig->{$service}); + } + } + delete $ctx->{lastZmdConfig}; + $ctx->{lastZmdConfig} = $RWlastZmdConfig; + + my $RWZmdConfig = {}; + + foreach my $service (keys %{$ctx->{zmdConfig}}) + { + if(lc($ctx->{zmdConfig}->{$service}->{type}) eq "nu") + { + foreach my $catname (keys %{$ctx->{zmdConfig}->{$service}->{catalog}}) + { + $RWZmdConfig->{$ctx->{zmdConfig}->{$service}->{catalog}->{$catname}->{url}}->{url} = $ctx->{zmdConfig}->{$service}->{catalog}->{$catname}->{url}; + $RWZmdConfig->{$ctx->{zmdConfig}->{$service}->{catalog}->{$catname}->{url}}->{type} = 'zypp'; + $RWZmdConfig->{$ctx->{zmdConfig}->{$service}->{catalog}->{$catname}->{url}}->{alias} = $catname; + } + } + else + { + SUSE::SRPrivate::copyService($ctx->{zmdConfig}->{$service}, $RWZmdConfig->{$service}); + } + } + delete $ctx->{zmdConfig}; + $ctx->{zmdConfig} = $RWZmdConfig; + } + print STDERR "---------------- lastZmdConfig --------------------\n". Data::Dumper->Dump([$ctx->{lastZmdConfig}])."\n" if($ctx->{debug} >= 3); print STDERR "---------------- zmdConfig --------------------\n". @@ -1228,7 +1276,7 @@ print STDERR "---------------- currentSources --------------------\n". Data::Dumper->Dump([$ctx->{currentSources}])."\n" if($ctx->{debug} >= 3); - + push @allServices, (keys %{$ctx->{lastZmdConfig}}); push @allServices, (keys %{$ctx->{zmdConfig}}); push @allServices, (keys %{$ctx->{currentSources}}); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org