[yast-commit] [ci_new_pac] JFYI yast2-installation -> sle12
Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-installation -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-installation/yast2-installation.changes 2014-07-21 17:52:06.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-installation/yast2-installation.changes 2014-07-22 08:24:30.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 22 08:13:41 CEST 2014 - snwint@suse.de + +- linuxrc already provides proxy settings in URL form - so use it +- 3.1.103 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-installation - at least 19 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-installation (Old) and /mounts/work_src_done/SLE12/yast2-installation (BS:build ID:41573 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-installation-3.1.102.tar.bz2 New: ---- yast2-installation-3.1.103.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.ZD17Ni/_old 2014-07-22 12:03:23.000000000 +0200 +++ /var/tmp/diff_new_pack.ZD17Ni/_new 2014-07-22 12:03:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.102 +Version: 3.1.103 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.102.tar.bz2 -> yast2-installation-3.1.103.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.102/package/yast2-installation.changes new/yast2-installation-3.1.103/package/yast2-installation.changes --- old/yast2-installation-3.1.102/package/yast2-installation.changes 2014-07-21 16:36:45.000000000 +0200 +++ new/yast2-installation-3.1.103/package/yast2-installation.changes 2014-07-22 08:20:56.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jul 22 08:13:41 CEST 2014 - snwint@suse.de + +- linuxrc already provides proxy settings in URL form - so use it +- 3.1.103 + +------------------------------------------------------------------- Mon Jul 21 12:10:43 CEST 2014 - schubi@suse.de - taking display-manager.service instead of xdm.service in the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.102/package/yast2-installation.spec new/yast2-installation-3.1.103/package/yast2-installation.spec --- old/yast2-installation-3.1.102/package/yast2-installation.spec 2014-07-21 16:36:45.000000000 +0200 +++ new/yast2-installation-3.1.103/package/yast2-installation.spec 2014-07-22 08:20:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.102 +Version: 3.1.103 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.102/src/clients/proxy_finish.rb new/yast2-installation-3.1.103/src/clients/proxy_finish.rb --- old/yast2-installation-3.1.102/src/clients/proxy_finish.rb 2014-07-21 16:36:45.000000000 +0200 +++ new/yast2-installation-3.1.103/src/clients/proxy_finish.rb 2014-07-22 08:20:56.000000000 +0200 @@ -65,28 +65,14 @@ } elsif @func == "Write" if Stage.initial - @proxy = Convert.to_string(SCR.Read(path(".etc.install_inf.Proxy"))) - @proxyport = Convert.to_string( - SCR.Read(path(".etc.install_inf.ProxyPort")) - ) - @proxyproto = Convert.to_string( - SCR.Read(path(".etc.install_inf.ProxyProto")) - ) + @proxy = Convert.to_string(SCR.Read(path(".etc.install_inf.ProxyURL"))) - if @proxy != nil && @proxyport != nil && @proxyproto != nil - @fullproxy = Ops.add( - Ops.add( - Ops.add(Ops.add(Ops.add(@proxyproto, "://"), @proxy), ":"), - @proxyport - ), - "/" - ) - - Builtins.y2milestone("setting proxy to %1", @fullproxy) + if @proxy != nil + Builtins.y2milestone("setting proxy to %1", @proxy) # maybe use Proxy module - SCR.Write(path(".sysconfig.proxy.HTTP_PROXY"), @fullproxy) - SCR.Write(path(".sysconfig.proxy.FTP_PROXY"), @fullproxy) + SCR.Write(path(".sysconfig.proxy.HTTP_PROXY"), @proxy) + SCR.Write(path(".sysconfig.proxy.FTP_PROXY"), @proxy) SCR.Write(path(".sysconfig.proxy"), nil) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.102/startup/common/misc.sh new/yast2-installation-3.1.103/startup/common/misc.sh --- old/yast2-installation-3.1.102/startup/common/misc.sh 2014-07-21 16:36:45.000000000 +0200 +++ new/yast2-installation-3.1.103/startup/common/misc.sh 2014-07-22 08:20:56.000000000 +0200 @@ -22,15 +22,9 @@ # If Proxy: is set in install.inf export the env # variables for http_proxy and ftp_proxy # --- - if [ -f /etc/install.inf ];then - if grep -qs '^Proxy:.*' /etc/install.inf ; then - Proxy=$(awk ' /^Proxy:/ { print $2 }' < /etc/install.inf) - ProxyPort=$(awk ' /^ProxyPort:/ { print $2 }' < /etc/install.inf) - ProxyProto=$(awk ' /^ProxyProto:/ { print $2 }' < /etc/install.inf) - FullProxy="${ProxyProto}://${Proxy}:${ProxyPort}/" - export http_proxy=$FullProxy - export ftp_proxy=$FullProxy - fi + if [ "$ProxyURL" ] ; then + export http_proxy="$ProxyURL" + export ftp_proxy="$ProxyURL" fi } continue with "q"... Checked in at Tue Jul 22 12:03:47 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
ro