Hello community,
here is the log from the commit of package yast2
checked in at Wed Oct 8 12:06:48 CEST 2008.
--------
--- yast2/yast2.changes 2008-10-06 13:59:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-10-07 18:10:22.000000000 +0200
@@ -1,0 +2,12 @@
+Tue Oct 7 17:48:31 CEST 2008 - lslezak@suse.cz
+
+- fixed reference markers (%1) in a popup message (bnc#432518)
+- 2.17.38
+
+-------------------------------------------------------------------
+Mon Oct 6 14:38:59 CEST 2008 - locilka@suse.cz
+
+- Module PackagesProposal extended to handle also patterns
+ (bnc #431580, bnc #431503)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-2.17.37.tar.bz2
New:
----
yast2-2.17.38.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.l17118/_old 2008-10-08 12:06:04.000000000 +0200
+++ /var/tmp/diff_new_pack.l17118/_new 2008-10-08 12:06:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.17.37)
+# spec file for package yast2 (Version 2.17.38)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2
-Version: 2.17.37
+Version: 2.17.38
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.17.37.tar.bz2
+Source0: yast2-2.17.38.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
@@ -147,7 +147,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.17.37
+%setup -n yast2-2.17.38
%build
%{prefix}/bin/y2tool y2autoconf
@@ -251,6 +251,12 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Tue Oct 07 2008 lslezak@suse.cz
+- fixed reference markers (%%1) in a popup message (bnc#432518)
+- 2.17.38
+* Mon Oct 06 2008 locilka@suse.cz
+- Module PackagesProposal extended to handle also patterns
+ (bnc #431580, bnc #431503)
* Mon Oct 06 2008 visnov@suse.cz
- Added icon to hardware detection confirmation (bnc #431276)
- 2.17.37
++++++ yast2-2.17.37.tar.bz2 -> yast2-2.17.38.tar.bz2 ++++++
++++ 5780 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-2.17.37/configure.in new/yast2-2.17.38/configure.in
--- old/yast2-2.17.37/configure.in 2008-09-30 09:58:14.000000000 +0200
+++ new/yast2-2.17.38/configure.in 2008-10-07 18:10:48.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.17.35, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.17.38, http://bugs.opensuse.org/, yast2)
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.17.35"
+VERSION="2.17.38"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
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-2.17.37/library/control/src/ProductControl.ycp new/yast2-2.17.38/library/control/src/ProductControl.ycp
--- old/yast2-2.17.37/library/control/src/ProductControl.ycp 2008-09-30 09:57:36.000000000 +0200
+++ new/yast2-2.17.38/library/control/src/ProductControl.ycp 2008-10-07 16:33:32.000000000 +0200
@@ -7,7 +7,7 @@
* Jiri Srain
* Lukas Ocilka
*
- * $Id: ProductControl.ycp 51251 2008-09-17 16:53:15Z locilka $
+ * $Id: ProductControl.ycp 51926 2008-10-07 14:33:34Z locilka $
*/
{
textdomain "base";
@@ -1059,20 +1059,28 @@
global string GetTranslatedText (string key) {
map controlfile_texts = ProductFeatures::GetSection ("texts");
+
+ if (! haskey (controlfile_texts, key)) {
+ y2error ("No such text %1", key);
+ return "";
+ }
+
map text = (map ) controlfile_texts[key]:$[];
string label = text["label"]:"";
- if (label == "")
- {
- y2error ("The requested label %1 does not exist", key);
+
+ // an empty string doesn't need to be translated
+ if (label == "") {
return "";
}
+
string domain = text["textdomain"]:productControl["textdomain"]:"control";
if (domain == "")
{
- y2error ("The text domain for label %1 not set", key);
+ y2warning ("The text domain for label %1 not set", key);
return label;
}
+
return dgettext (domain, label);
}
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-2.17.37/library/modules/Version.ycp new/yast2-2.17.38/library/modules/Version.ycp
--- old/yast2-2.17.37/library/modules/Version.ycp 2008-10-06 13:38:09.000000000 +0200
+++ new/yast2-2.17.38/library/modules/Version.ycp 2008-10-07 18:10:58.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.17.37";
+global string yast2 = "2.17.38";
/* EOF */
}
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-2.17.37/library/packages/src/PackagesProposal.ycp new/yast2-2.17.38/library/packages/src/PackagesProposal.ycp
--- old/yast2-2.17.37/library/packages/src/PackagesProposal.ycp 2008-10-03 10:11:54.000000000 +0200
+++ new/yast2-2.17.38/library/packages/src/PackagesProposal.ycp 2008-10-07 13:14:01.000000000 +0200
@@ -11,28 +11,32 @@
/***
*
* This module provides API for packages that want software
- * proposal to select some packages for installation.
+ * proposal to select some resolvables for installation.
+ * Clients of this module identify themselves by their own
+ * unique ID, thus one client doesn't change other clients
+ * requirements.
*
+ * @example
* // No packages selected initially
* y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package));
- *
+ *
* // Adding packages for ID_1
* PackagesProposal::AddResolvables ("ID_1", `package, ["aa", "bb", "cc"]);
* y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package));
- *
+ *
* // Adding packages for ID_2
* // 'cc' is shared with ID_1
* PackagesProposal::AddResolvables ("ID_2", `package, ["cc", "dd", "ee"]);
* y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package));
- *
+ *
* // Get all packages required by ID_1
* list <string> required_packages = PackagesProposal::GetResolvables ("ID_1", `package);
* y2internal ("Packages required by ID_1: %1", required_packages);
- *
+ *
* // Removing all packages required by ID_1
* PackagesProposal::RemoveResolvables ("ID_1", `package, required_packages);
* y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package));
- *
+ *
* // Removing some packages required by ID_2
* PackagesProposal::RemoveResolvables ("ID_2", `package, ["cc", "dd"]);
* y2internal ("Packages to install: %1", PackagesProposal::GetAllResolvables (`package));
@@ -54,9 +58,33 @@
map > resolvables_to_install = $[];
/**
+ * Resets all resolvables to install. Use carefully.
+ */
+ global void ResetAll () {
+ if (resolvables_to_install != $[]) {
+ y2warning ("Reseting all PackagesProposal items");
+ } else {
+ y2milestone ("Reseting all PackagesProposal items");
+ }
+
+ resolvables_to_install = $[];
+ }
+
+ /**
* List of currently supported types of resolvables
*/
- list <symbol> supported_resolvables = [`package];
+ list <symbol> supported_resolvables = [`package, `pattern];
+
+ /**
+ * Returns list of resolvables currently supported by this module.
+ *
+ * @example GetSupportedResolvables() -> [`package, `pattern, ... ]
+ *
+ * @return list <symbol> of resolvables
+ */
+ global list <symbol> GetSupportedResolvables () {
+ return supported_resolvables;
+ }
boolean IsSupportedResolvableType (symbol type) {
if (type == nil) {
@@ -68,7 +96,47 @@
}
/**
- * Adds list of packages to pool that is then used by software proposal
+ * Checks the currently created data structure and creates
+ * missing keys if needed.
+ *
+ * @param string unique_ID
+ * @param symbol type
+ */
+ void CreateEmptyStructureIfMissing (string unique_ID, symbol type) {
+ if (! haskey (resolvables_to_install, unique_ID)) {
+ y2debug ("Creating '%1' key in resolvables_to_install", unique_ID);
+ resolvables_to_install[unique_ID] = $[];
+ }
+
+ if (! haskey (resolvables_to_install[unique_ID]:$[], type)) {
+ y2debug ("Creating '%1' key in resolvables_to_install[%2]", type, unique_ID);
+ resolvables_to_install[unique_ID, type] = [];
+ }
+ }
+
+ /**
+ * Checks parameters for global functions
+ *
+ * @param string unique_ID
+ * @param symbol type
+ * @return boolean if parameters are correct
+ */
+ boolean CheckParams (string unique_ID, symbol type) {
+ if (unique_ID == nil || unique_ID == "") {
+ y2error ("Unique ID cannot be: %1", unique_ID);
+ return false;
+ }
+
+ if (! IsSupportedResolvableType (type)) {
+ y2error ("Not a supported type: %1, supported are only: %2", type, supported_resolvables);
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Adds list of resolvables to pool that is then used by software proposal
* to propose a selection of resolvables to install.
*
* @param string unique_ID
@@ -85,24 +153,14 @@
* @see RemoveResolvables()
*/
global boolean AddResolvables (string unique_ID, symbol type, list <string> resolvables) {
- if (unique_ID == nil || unique_ID == "") {
- y2error ("Unique ID cannot be: %1", unique_ID);
+ if (! CheckParams (unique_ID, type))
return false;
- }
- if (! IsSupportedResolvableType (type)) {
- y2error ("Not a supported type: %1, supported are only: %2", type, supported_resolvables);
- return false;
- }
-
- if (! haskey (resolvables_to_install, unique_ID)) {
- y2debug ("Creating '%1' key in resolvables_to_install", unique_ID);
- resolvables_to_install[unique_ID] = $[];
- }
+ CreateEmptyStructureIfMissing (unique_ID, type);
- if (! haskey (resolvables_to_install[unique_ID]:$[], type)) {
- y2debug ("Creating '%1' key in resolvables_to_install[%2]", type, unique_ID);
- resolvables_to_install[unique_ID, type] = [];
+ if (resolvables == nil) {
+ y2warning ("Changing resolvables %1 to empty list", resolvables);
+ resolvables = [];
}
y2milestone ("Adding resolvables %1 type %2 for %3", resolvables, type, unique_ID);
@@ -113,6 +171,33 @@
}
/**
+ * Replaces the current resolvables with new ones. Similar to AddResolvables()
+ * but it replaces the list of resolvables instead of adding them to the pool.
+ * It always replaces only the part that is identified by the unique_ID.
+ *
+ * @param string unique_ID
+ * @param symbol resolvable type
+ * @param list <string> of resolvables to add for installation
+ * @return boolean whether successful
+ */
+ global boolean SetResolvables (string unique_ID, symbol type, list <string> resolvables) {
+ if (! CheckParams (unique_ID, type))
+ return false;
+
+ CreateEmptyStructureIfMissing (unique_ID, type);
+
+ if (resolvables == nil) {
+ y2warning ("Changing resolvables %1 to empty list", resolvables);
+ resolvables = [];
+ }
+
+ y2milestone ("Adjusting resolvables %1 type %2 for %3", resolvables, type, unique_ID);
+ resolvables_to_install[unique_ID, type] = resolvables;
+
+ return true;
+ }
+
+ /**
* Removes list of packages from pool that is then used by software proposal
* to propose a selection of resolvables to install.
*
@@ -128,24 +213,14 @@
* @see AddResolvables()
*/
global boolean RemoveResolvables (string unique_ID, symbol type, list <string> resolvables) {
- if (unique_ID == nil || unique_ID == "") {
- y2error ("Unique ID cannot be: %1", unique_ID);
+ if (! CheckParams (unique_ID, type))
return false;
- }
- if (! IsSupportedResolvableType (type)) {
- y2error ("Not a supported type: %1, supported are only: %2", type, supported_resolvables);
- return false;
- }
-
- if (! haskey (resolvables_to_install, unique_ID)) {
- y2debug ("Creating '%1' key in resolvables_to_install", unique_ID);
- resolvables_to_install[unique_ID] = $[];
- }
+ CreateEmptyStructureIfMissing (unique_ID, type);
- if (! haskey (resolvables_to_install[unique_ID]:$[], type)) {
- y2debug ("Creating '%1' key in resolvables_to_install[%2]", type, unique_ID);
- resolvables_to_install[unique_ID, type] = [];
+ if (resolvables == nil) {
+ y2warning ("Changing resolvables %1 to empty list", resolvables);
+ resolvables = [];
}
y2milestone ("Removing resolvables %1 type %2 for %3", resolvables, type, unique_ID);
@@ -168,15 +243,8 @@
* GetResolvables ("y2_kdump", `package) -> ["yast2-kdump", "kdump"]
*/
global list <string> GetResolvables (string unique_ID, symbol type) {
- if (unique_ID == nil || unique_ID == "") {
- y2error ("Unique ID cannot be: %1", unique_ID);
+ if (! CheckParams (unique_ID, type))
return nil;
- }
-
- if (! IsSupportedResolvableType (type)) {
- y2error ("Not a supported type: %1, supported are only: %2", type, supported_resolvables);
- return nil;
- }
return resolvables_to_install[unique_ID, type]:[];
}
@@ -189,6 +257,7 @@
*
* @example
* GetAllResolvables (`package) -> ["list", "of", "packages"]
+ * GetAllResolvables (`pattern) -> ["list", "of", "patterns"]
* // not a supported resolvable type
* GetAllResolvables (`unknown) -> nil
*
@@ -204,7 +273,42 @@
foreach (string unique_ID, map resolvables, resolvables_to_install, {
if (haskey (resolvables, type)) {
- ret = (list <string>) union (ret, resolvables[type]:[]);
+ ret = sort ((list <string>) union (ret, resolvables[type]:[]));
+ }
+ });
+
+ return ret;
+ }
+
+ /**
+ * Returns all selected resolvables for all supported types
+ *
+ * @return map map of resolvables
+ * @struct $[
+ * `resolvable_type : [ "list", "of", "resolvables" ],
+ * `another_type : [ "list", "of", "resolvables" ],
+ * ]
+ *
+ * @example
+ * // No resolvables selected
+ * GetAllResolvablesForAllTypes() -> $[]
+ * // Only patterns selected
+ * GetAllResolvablesForAllTypes() -> $[`pattern : ["some", "patterns"]]
+ * // Also packages selected
+ * GetAllResolvablesForAllTypes() -> $[
+ * `pattern : ["some", "patterns"],
+ * `package : ["some", "packages"],
+ * ]
+ */
+ global map GetAllResolvablesForAllTypes () {
+ map ret = $[];
+ list <string> resolvables = [];
+
+ foreach (symbol one_type, GetSupportedResolvables(), {
+ resolvables = GetAllResolvables (one_type);
+
+ if (resolvables != nil && resolvables != []) {
+ ret[one_type] = resolvables;
}
});
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-2.17.37/library/packages/src/SignatureCheckDialogs.ycp new/yast2-2.17.38/library/packages/src/SignatureCheckDialogs.ycp
--- old/yast2-2.17.37/library/packages/src/SignatureCheckDialogs.ycp 2008-09-30 09:57:49.000000000 +0200
+++ new/yast2-2.17.38/library/packages/src/SignatureCheckDialogs.ycp 2008-10-07 18:08:23.000000000 +0200
@@ -364,8 +364,8 @@
// popup question, %1 stands for the package name
// %2 is a repository name
// %3 is URL of the repository
- _("The package %1 from repository %1
-%2
+ _("The package %1 from repository %2
+%3
is not digitally signed. This means that the origin
and integrity of the package cannot be verified. Installing the package
may put the integrity of your system at risk.
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-2.17.37/VERSION new/yast2-2.17.38/VERSION
--- old/yast2-2.17.37/VERSION 2008-10-06 13:35:36.000000000 +0200
+++ new/yast2-2.17.38/VERSION 2008-10-06 14:41:56.000000000 +0200
@@ -1 +1 @@
-2.17.37
+2.17.38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org