Hello community, here is the log from the commit of package suseRegister checked in at Fri Feb 23 12:19:13 CET 2007. -------- --- suseRegister/suseRegister.changes 2007-02-14 13:44:22.000000000 +0100 +++ /mounts/work_src_done/NOARCH/suseRegister/suseRegister.changes 2007-02-22 15:04:16.796167000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 22 15:03:43 CET 2007 - mc@suse.de + +- when zyppServiceAdd is called via addCatalog add credentials + to the URL + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.z31724/_old 2007-02-23 12:19:09.000000000 +0100 +++ /var/tmp/diff_new_pack.z31724/_new 2007-02-23 12:19:09.000000000 +0100 @@ -12,7 +12,7 @@ Name: suseRegister Version: 1.2 -Release: 21 +Release: 22 Summary: Registration Tool Group: Productivity/Other License: GNU General Public License (GPL) @@ -90,7 +90,10 @@ %attr(0755, root, root) /%{_sysconfdir}/NetworkManager/dispatcher.d/suseRegister %endif -%changelog -n suseRegister +%changelog +* Thu Feb 22 2007 - mc@suse.de +- when zyppServiceAdd is called via addCatalog add credentials + to the URL * Wed Feb 14 2007 - mc@suse.de - --norug should only avoid adding and subscribing new sources. * Mon Feb 12 2007 - mc@suse.de ++++++ suseRegister-1.2.tar.bz2 ++++++ 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 2007-02-14 13:42:26.000000000 +0100 +++ new/suseRegister-1.2/SuseRegister.pm 2007-02-22 14:45:21.000000000 +0100 @@ -1710,8 +1710,22 @@ # first add it with zypp if url is available if(exists $catalog->{url}) { + # a rug catalog is from NU service and needs auth data + my $secret = ""; + open(SEC, "< $ctx->{SECRET_FILE}") or do { + logPrintExit("Cannot open file $ctx->{SECRET_FILE}: $!\n", 12); + }; + while(<SEC>) + { + $secret .= $_; + } + close SEC; + + my $curi = URI->new($catalog->{url}); + $curi->userinfo($ctx->{guid}.":$secret"); + # A rug catalog is a zypp service - so call zyppServiceAdd - ($code, $msg) = SUSE::SRPrivate::zyppServiceAdd($ctx, $catalog->{url}, "zypp", $name); + ($code, $msg) = SUSE::SRPrivate::zyppServiceAdd($ctx, $curi->as_string, "zypp", $name); if($code != 0) { $lastcode = $code; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de