Hello community, here is the log from the commit of package yast2-installation for openSUSE:12.2 checked in at 2012-07-12 13:50:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/yast2-installation (Old) and /work/SRC/openSUSE:12.2/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation", Maintainer is "jsuch...@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/yast2-installation/yast2-installation.changes 2012-06-29 07:04:13.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.yast2-installation.new/yast2-installation.changes 2012-07-12 13:51:01.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 11 15:56:38 CEST 2012 - jsuch...@suse.cz + +- create simpler and non translated aliases for update sources + (bnc#768624) +- 2.22.10 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.22.9.tar.bz2 New: ---- yast2-installation-2.22.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.GIlsip/_old 2012-07-12 13:51:01.000000000 +0200 +++ /var/tmp/diff_new_pack.GIlsip/_new 2012-07-12 13:51:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-installation # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,28 @@ Name: yast2-installation -Version: 2.22.9 +Version: 2.22.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-installation-%{version}.tar.bz2 - -Group: System/YaST -License: GPL-2.0 Summary: YaST2 - Installation Parts +License: GPL-2.0 +Group: System/YaST Source1: YaST2-Second-Stage.service Source2: YaST2-Firstboot.service -BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite +BuildRequires: docbook-xsl-stylesheets +BuildRequires: doxygen +BuildRequires: libxslt +BuildRequires: perl-XML-Writer +BuildRequires: sgml-skel +BuildRequires: update-desktop-files +BuildRequires: yast2-core-devel +BuildRequires: yast2-devtools +BuildRequires: yast2-testsuite # FileSystems::possible_root_fs BuildRequires: yast2-storage >= 2.19.12 @@ -101,8 +108,9 @@ Conflicts: yast2-ycp-ui-bindings < 2.17.3 # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) -Requires: tar gzip Requires: coreutils +Requires: gzip +Requires: tar %if 0%{?suse_version} >= 1210 BuildRequires: systemd-devel @@ -132,12 +140,12 @@ BuildArch: noarch %package devel-doc -Group: Documentation/HTML Requires: yast2-installation >= 2.15.34 PreReq: %fillup_prereq Summary: YaST2 - Installation Parts +Group: Documentation/HTML %description System installation code as present on installation media. @@ -246,3 +254,5 @@ %doc %{_prefix}/share/doc/packages/yast2-installation %exclude %{_prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{_prefix}/share/doc/packages/yast2-installation/README + +%changelog ++++++ yast2-installation-2.22.9.tar.bz2 -> yast2-installation-2.22.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.22.9/VERSION new/yast2-installation-2.22.10/VERSION --- old/yast2-installation-2.22.9/VERSION 2012-06-28 14:37:04.000000000 +0200 +++ new/yast2-installation-2.22.10/VERSION 2012-07-11 15:57:32.000000000 +0200 @@ -1 +1 @@ -2.22.9 +2.22.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.22.9/src/clients/inst_addon_update_sources.ycp new/yast2-installation-2.22.10/src/clients/inst_addon_update_sources.ycp --- old/yast2-installation-2.22.9/src/clients/inst_addon_update_sources.ycp 2012-06-25 11:05:52.000000000 +0200 +++ new/yast2-installation-2.22.10/src/clients/inst_addon_update_sources.ycp 2012-07-09 13:10:47.000000000 +0200 @@ -45,6 +45,7 @@ if ( GetInstArgs::going_back()) // going backwards? return `auto; // don't execute this once more +map <string,string> aliases = $[]; /** * @return the urls of known installation sources @@ -74,6 +75,8 @@ p["display_name"]:p["name"]:p["summary"]:_("Unknown Product"), p["version"]:"" ); + // alias should be simple (bnc#768624) + aliases[u] = String::Replace ("update-" + p["display_name"]:p["name"]:"repo", " ", "-"); }); }); @@ -112,8 +115,12 @@ // BNC #557723: Repositories migh be created without access to network // Libzypp must not probe the repo - // don't use spaces in alias (hard to use with zypper) - string alias = String::Replace((size(name) > 0 ? name : url), " ", "-"); + string alias = aliases[url]:""; + if (alias == "") + { + // don't use spaces in alias (hard to use with zypper) + alias = String::Replace((size(name) > 0 ? name : url), " ", "-"); + } map <string,any> repo_prop = $[ "enabled" : true, -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org