Mailinglist Archive: opensuse-commit (750 mails)
| < Previous | Next > |
commit yast2-installation for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sat, 03 Oct 2009 00:51:14 +0200
- Message-id: <20091002225115.7450A637F@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory
checked in at Sat Oct 3 00:51:14 CEST 2009.
--------
--- yast2-installation/yast2-installation.changes 2009-09-24
16:04:16.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2009-10-01
13:33:03.000000000 +0200
@@ -1,0 +2,15 @@
+Thu Oct 1 13:27:16 CEST 2009 - locilka@xxxxxxx
+
+- Adjusting understandable name for update URLs added during second
+ stage of installation (bnc #542792).
+- 2.18.29
+
+-------------------------------------------------------------------
+Tue Sep 29 16:41:32 CEST 2009 - kmachalkova@xxxxxxx
+
+- Correct HTML format tags in helptext (bnc#540784)
+- Set firewall status according to user's choice also in non-automatic
+ 2nd stage (missing call for AdjustDisabledSubProposals) (bnc#534862)
+- 2.18.28
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-installation-2.18.27.tar.bz2
New:
----
yast2-installation-2.18.29.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.ISRuVG/_old 2009-10-03 00:49:20.000000000 +0200
+++ /var/tmp/diff_new_pack.ISRuVG/_new 2009-10-03 00:49:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.18.27)
+# spec file for package yast2-installation (Version 2.18.29)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@
Name: yast2-installation
-Version: 2.18.27
+Version: 2.18.29
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.18.27.tar.bz2
+Source0: yast2-installation-2.18.29.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPL v2 or later
@@ -103,7 +103,7 @@
System installation code as present on installation media.
%prep
-%setup -n yast2-installation-2.18.27
+%setup -n yast2-installation-2.18.29
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-installation-2.18.27.tar.bz2 -> yast2-installation-2.18.29.tar.bz2
++++++
++++ 9066 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.27/VERSION new/yast2-installation-2.18.29/VERSION
--- old/yast2-installation-2.18.27/VERSION 2009-09-24 15:53:21.000000000
+0200
+++ new/yast2-installation-2.18.29/VERSION 2009-10-01 13:26:52.000000000
+0200
@@ -1 +1 @@
-2.18.27
+2.18.29
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.27/configure.in
new/yast2-installation-2.18.29/configure.in
--- old/yast2-installation-2.18.27/configure.in 2009-09-07 10:42:27.000000000
+0200
+++ new/yast2-installation-2.18.29/configure.in 2009-07-18 10:21:33.000000000
+0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.18.24, http://bugs.opensuse.org/,
yast2-installation)
+AC_INIT(yast2-installation, 2.18.19, http://bugs.opensuse.org/,
yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.18.24"
+VERSION="2.18.19"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka <locilka@xxxxxxx>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.27/src/clients/inst_addon_update_sources.ycp
new/yast2-installation-2.18.29/src/clients/inst_addon_update_sources.ycp
--- old/yast2-installation-2.18.27/src/clients/inst_addon_update_sources.ycp
2009-06-24 12:54:06.000000000 +0200
+++ new/yast2-installation-2.18.29/src/clients/inst_addon_update_sources.ycp
2009-10-01 13:20:49.000000000 +0200
@@ -40,13 +40,23 @@
/**
* @return the installation sources to be added
*/
-list<string> UpdateUrls () {
- // get all available products
- list<map<string,any> > products = Pkg::ResolvableProperties ("", `product,
"");
- list<list<string> > urls = maplist (map<string, any> p, products, {
- return p["update_urls"]:[];
+map <string, string> UpdateUrls () {
+ map <string, string> urls = $[];
+ list <map <string,any> > products = Pkg::ResolvableProperties ("",
`product, "");
+
+ foreach (map<string, any> p, products, {
+ foreach (string u, p["update_urls"]:[], {
+ // bnc #542792
+ // Repository name must be generated from product details
+ urls[u] = sformat (
+ _("Updates for %1 %2"),
+ p["display_name"]:p["name"]:p["summary"]:_("Unknown Product"),
+ p["version"]:""
+ );
+ });
});
- return (list<string>)toset (flatten (urls));
+
+ return urls;
}
@@ -64,23 +74,23 @@
y2milestone ("sources known: %1", knownUrls);
map<string, boolean> is_known = listmap (string u, knownUrls, ``($[u: true]));
-list<string> updateUrls = UpdateUrls ();
+map <string, string> updateUrls = UpdateUrls ();
y2milestone ("sources for updates: %1", updateUrls);
-list<string> addUrls = filter (string u, updateUrls, ``( ! is_known[u]:false
));
+map <string, string> addUrls = filter (string url, string name, updateUrls,
``( ! is_known[url]:false ));
y2milestone ("sources to add: %1", addUrls);
-if (addUrls != [])
+if (addUrls != $[])
{
Popup::ShowFeedback (heading, message);
list<integer> added_ids = [];
- foreach (string u, addUrls, {
+ foreach (string url, string name, addUrls, {
boolean again = true;
while (again) {
- integer srcid = Pkg::SourceCreate (u, "/");
- y2milestone ("got %1 from creating %2", srcid, u);
+ integer srcid = Pkg::SourceCreate (url, "/");
+ y2milestone ("got %1 from creating %2", srcid, url);
// wrong srcid, must have failed
if (srcid == -1) {
@@ -94,7 +104,7 @@
Pkg::LastError()
))) {
// try again
- u = editUrl (u);
+ url = editUrl (url);
} else {
// abort
again = false;
@@ -102,6 +112,9 @@
// everything is ok
} else {
+ // bnc #542792
+ // Repository name must be set
+ Pkg::SourceEditSet([ $["SrcId" : srcid, "name" : name] ]);
added_ids = add (added_ids, srcid);
again = false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.27/src/clients/inst_new_desktop.ycp
new/yast2-installation-2.18.29/src/clients/inst_new_desktop.ycp
--- old/yast2-installation-2.18.27/src/clients/inst_new_desktop.ycp
2009-09-14 11:04:53.000000000 +0200
+++ new/yast2-installation-2.18.29/src/clients/inst_new_desktop.ycp
2009-09-29 16:50:30.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Lukas Ocilka <locilka@xxxxxxx>
* Stephan Kulow <coolo@xxxxxxx>
*
- * $Id: inst_new_desktop.ycp 58629 2009-09-14 09:04:51Z kmachalkova $
+ * $Id: inst_new_desktop.ycp 58814 2009-09-29 14:30:54Z kmachalkova $
*
*/
@@ -33,7 +33,7 @@
// TRANSLATORS: help text, part 1
string help = _("<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i>
offers a number
of different desktop environments. Below you see a list of the 2 major ones
-<b>GNOME</b> and <b>KDE</b>.") +
+<b>GNOME</b> and <b>KDE</b>.</p>") +
// TRANSLATORS: help text, part 3
_("<p>You may select alternative desktop environments (or one of minimal
installation patterns)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-installation-2.18.27/src/include/inst_inc_second.ycp
new/yast2-installation-2.18.29/src/include/inst_inc_second.ycp
--- old/yast2-installation-2.18.27/src/include/inst_inc_second.ycp
2009-09-04 18:28:41.000000000 +0200
+++ new/yast2-installation-2.18.29/src/include/inst_inc_second.ycp
2009-10-01 12:50:20.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Functions for second stage
* Authors: Lukas Ocilka <locilka@xxxxxxx>
*
- * $Id: inst_inc_second.ycp 58537 2009-09-04 16:28:41Z kmachalkova $
+ * $Id: inst_inc_second.ycp 58818 2009-09-29 14:57:45Z kmachalkova $
*
*/
{
@@ -103,7 +103,7 @@
});
});
- y2milestone ("Disabled AC items set to %1",
ProductControl::GetDisabledSubProposals());
+ y2milestone ("Disabled subproposals set to %1",
ProductControl::GetDisabledSubProposals());
}
void AdjustDisabledACItems () {
@@ -135,7 +135,7 @@
void AdjustDisabledItems () {
AdjustDisabledModules();
AdjustDisabledProposals();
- AdjustDisabledProposals();
+ AdjustDisabledSubProposals();
AdjustDisabledACItems();
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |