Hello community, here is the log from the commit of package suseRegister checked in at Fri Jul 13 20:53:21 CEST 2007. -------- --- suseRegister/suseRegister.changes 2007-06-05 15:42:04.000000000 +0200 +++ /mounts/work_src_done/NOARCH/suseRegister/suseRegister.changes 2007-07-12 16:15:40.180179000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 12 16:14:45 CEST 2007 - mc@suse.de + +- do not subscribe catalogs which were not added before + [#271861] +- use URL as alias fallback[#271861] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.Af9977/_old 2007-07-13 20:52:57.000000000 +0200 +++ /var/tmp/diff_new_pack.Af9977/_new 2007-07-13 20:52:57.000000000 +0200 @@ -12,10 +12,10 @@ Name: suseRegister Version: 1.2 -Release: 47 +Release: 55 Summary: Registration Tool Group: Productivity/Other -License: GNU General Public License (GPL) +License: GPL v2 or later Source: %{name}-%{version}.tar.bz2 Source1: suseRegister.init Source2: suse-trigger-register.cron @@ -95,6 +95,10 @@ %endif %changelog +* Thu Jul 12 2007 - mc@suse.de +- do not subscribe catalogs which were not added before + [#271861] +- use URL as alias fallback[#271861] * Tue Jun 05 2007 - mc@suse.de - ignore missing sysconfig file [#279757] - save cache only on success [#278163] ++++++ 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 2007-06-05 15:40:03.000000000 +0200 +++ new/suseRegister-1.2/SRPrivate.pm 2007-07-12 16:14:00.000000000 +0200 @@ -1958,6 +1958,11 @@ { return logPrintReturn($ctx, "Invalid type", 14); } + + if($ctx->{nozypp}) + { + return (0,""); + } # zypper is not ready for this; use the wrapper instead if(0) @@ -1972,9 +1977,8 @@ } else { - # zypper requires a alias name. Use the hostname as fallback - my $u = URI->new($url); - push @rugArgs, $u->host; + # zypper requires a alias name. Use the url as fallback + push @rugArgs, $url; } print STDERR "zypper add service command: $ctx->{zypper} ".join(" ",@rugArgs)."\n" if($ctx->{debug} >= 1); @@ -2022,9 +2026,8 @@ } else { - # zypper requires a alias name. Use the hostname as fallback - my $u = URI->new($url); - push @rugArgs, $u->host; + # zypper requires a alias name. Use the url as fallback + push @rugArgs, $url; } print STDERR "zypper add service command: /usr/lib/suseRegister/bin/zypp_sa ".join(" ",@rugArgs)."\n" if($ctx->{debug} >= 1); @@ -2117,11 +2120,10 @@ } else { - my $u = URI->new($url); - push @rugArgs, $u->host; + # use url as fallback alias + push @rugArgs, $url; } - - + print STDERR "rug add service command: $ctx->{rug} ".join(" ",@rugArgs)."\n" if($ctx->{debug} >= 1); my $pid = open3(\*IN, \*OUT, \*ERR, $ctx->{rug}, @rugArgs) or do { 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-06-05 15:40:03.000000000 +0200 +++ new/suseRegister-1.2/SuseRegister.pm 2007-07-12 16:14:00.000000000 +0200 @@ -1685,8 +1685,8 @@ } } } - elsif(lc($type) eq "yum" || - lc($type) eq "zypp") + elsif((lc($type) eq "yum" || + lc($type) eq "zypp") && !$ctx->{nozypp}) { # need a subscribe too my $cat_name = $url; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org