Hello community,
here is the log from the commit of package yast2
checked in at Tue Apr 3 20:33:38 CEST 2007.
--------
--- yast2/yast2.changes 2007-03-28 17:10:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-04-02 14:48:50.443183000 +0200
@@ -1,0 +2,30 @@
+Mon Apr 2 14:15:53 CEST 2007 - jsuchome@suse.cz
+
+- fixed restarting after Patch CD update (#259825)
+- 2.15.23
+
+-------------------------------------------------------------------
+Mon Apr 2 14:11:12 CEST 2007 - lslezak@suse.cz
+
+- register new callbacks Pkg::CallbackSourceCreateInit/Destroy()
+ and Pkg::CallbackSourceReportInit/Destroy() (#251726)
+
+-------------------------------------------------------------------
+Mon Apr 2 10:59:49 CEST 2007 - locilka@suse.cz
+
+- Changed Firewall proposal to be unified with other network
+ proposals, e.g., "Firewall is enabled (disable)" (#259778).
+
+-------------------------------------------------------------------
+Fri Mar 30 08:23:46 CEST 2007 - locilka@suse.cz
+
+- SCR agent proc_meminfo.scr moved from yast2-storage to yast2
+
+-------------------------------------------------------------------
+Thu Mar 29 15:45:49 CEST 2007 - locilka@suse.cz
+
+- Added new WorkflowManager testsuite
+- Added some debugging functions into WorkflowManager
+- Changed ProductControl for easier testing
+
+-------------------------------------------------------------------
Old:
----
yast2-2.15.22.tar.bz2
New:
----
yast2-2.15.23.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.cZ6048/_old 2007-04-03 20:32:11.000000000 +0200
+++ /var/tmp/diff_new_pack.cZ6048/_new 2007-04-03 20:32:11.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.15.22)
+# spec file for package yast2 (Version 2.15.23)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,18 +11,18 @@
# norootforbuild
Name: yast2
-Version: 2.15.22
+Version: 2.15.23
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.15.22.tar.bz2
+Source0: yast2-2.15.23.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
# SCR::RegisterNewAgents()
Requires: yast2-core >= 2.15.4
-# Pkg::Callback*ScanDb()
-Requires: yast2-pkg-bindings >= 2.15.10
+# Pkg::CallbackSourceCreateInit/Destroy()
+Requires: yast2-pkg-bindings >= 2.15.13
Requires: yast2_ui yast2_theme
# For Cron Agent, Module
Requires: perl-Config-Crontab
@@ -101,7 +101,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.15.22
+%setup -n yast2-2.15.23
%build
%{prefix}/bin/y2tool y2autoconf
@@ -209,6 +209,21 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Mon Apr 02 2007 - jsuchome@suse.cz
+- fixed restarting after Patch CD update (#259825)
+- 2.15.23
+* Mon Apr 02 2007 - lslezak@suse.cz
+- register new callbacks Pkg::CallbackSourceCreateInit/Destroy()
+ and Pkg::CallbackSourceReportInit/Destroy() (#251726)
+* Mon Apr 02 2007 - locilka@suse.cz
+- Changed Firewall proposal to be unified with other network
+ proposals, e.g., "Firewall is enabled (disable)" (#259778).
+* Fri Mar 30 2007 - locilka@suse.cz
+- SCR agent proc_meminfo.scr moved from yast2-storage to yast2
+* Thu Mar 29 2007 - locilka@suse.cz
+- Added new WorkflowManager testsuite
+- Added some debugging functions into WorkflowManager
+- Changed ProductControl for easier testing
* Wed Mar 28 2007 - locilka@suse.cz
- Some testsuites have been moved from yast2-packager to yast2
- 2.15.22
++++++ yast2-2.15.22.tar.bz2 -> yast2-2.15.23.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/configure new/yast2-2.15.23/configure
--- old/yast2-2.15.22/configure 2007-03-28 16:22:59.000000000 +0200
+++ new/yast2-2.15.23/configure 2007-04-02 14:43:13.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2 2.15.21.
+# Generated by GNU Autoconf 2.60 for yast2 2.15.23.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.15.21'
-PACKAGE_STRING='yast2 2.15.21'
+PACKAGE_VERSION='2.15.23'
+PACKAGE_STRING='yast2 2.15.23'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1183,7 +1183,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2 2.15.21 to adapt to many kinds of systems.
+\`configure' configures yast2 2.15.23 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1254,7 +1254,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.15.21:";;
+ short | recursive ) echo "Configuration of yast2 2.15.23:";;
esac
cat <<\_ACEOF
@@ -1332,7 +1332,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.15.21
+yast2 configure 2.15.23
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1346,7 +1346,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2 $as_me 2.15.21, which was
+It was created by yast2 $as_me 2.15.23, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2147,7 +2147,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.15.21'
+ VERSION='2.15.23'
cat >>confdefs.h <<_ACEOF
@@ -2374,7 +2374,7 @@
-VERSION="2.15.21"
+VERSION="2.15.23"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -3366,7 +3366,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2 $as_me 2.15.21, which was
+This file was extended by yast2 $as_me 2.15.23, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3409,7 +3409,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.15.21
+yast2 config.status 2.15.23
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/configure.in new/yast2-2.15.23/configure.in
--- old/yast2-2.15.22/configure.in 2007-03-28 16:22:54.000000000 +0200
+++ new/yast2-2.15.23/configure.in 2007-04-02 14:43:08.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.15.21, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.15.23, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.21"
+VERSION="2.15.23"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/agents/proc_meminfo.scr new/yast2-2.15.23/library/agents/proc_meminfo.scr
--- old/yast2-2.15.22/library/agents/proc_meminfo.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.15.23/library/agents/proc_meminfo.scr 2007-04-02 13:54:49.000000000 +0200
@@ -0,0 +1,68 @@
+/**
+ * File:
+ * proc_meminfo.scr
+ * Summary:
+ * SCR Agent for reading /proc/meminfo
+ * Access:
+ * read-only
+ * Authors:
+ * Unknown
+ * See:
+ * anyagent
+ * libscr
+ * Example:
+ * Read (.proc.meminfo)
+ * -> $[
+ * "active":804312,
+ * "buffers":71292,
+ * "cached":254736,
+ * "highfree":0,
+ * "hightotal":0,
+ * "inactive":140676,
+ * "lowfree":9960,
+ * "lowtotal":1028088,
+ * "memfree":9960,
+ * "memtotal":1028088,
+ * "swapcached":30172,
+ * "swapfree":2037508,
+ * "swaptotal":2104472
+ * ]
+ *
+ * $Id: proc_meminfo.scr 37214 2007-03-30 07:48:08Z locilka $
+ *
+ * Returns a map. Keys for the map are: "active", "buffers", "cached",
+ * "highfree", "hightotal", "inactive", "lowfree", "lowtotal", "memfree",
+ * "memtotal", "swapcached", "swapfree", and "swaptotal".
+ * Values for all but "mem", "swap" are the respective size in kB.
+ */
+.proc.meminfo
+
+`ag_anyagent(
+ `Description (
+ (`File("/proc/meminfo")), // real file name
+ "#\n", // Comment
+ true, // read-only
+ (`Tuple (
+ `Choice (
+ [" ", `Sequence (`Whitespace(),"total",`String("^\n"))],
+ ["Mem:", `mem(`Tuple (`Whitespace(), `total(`Number()), `Whitespace(), `used(`Number()), `Whitespace(), `free(`Number()), `Whitespace(), `shared(`Number()), `Whitespace(), `buffers(`Number()), `Whitespace(), `cached(`Number())))],
+ ["Swap:", `swap(`Tuple (`Whitespace(), `total(`Number()), `Whitespace(), `used(`Number()), `Whitespace(), `free(`Number())))],
+ ["MemTotal:", `Sequence (`Whitespace(), `memtotal(`Number()), `String("^\n"))],
+ ["MemFree:", `Sequence (`Whitespace(), `memfree(`Number()), `String("^\n"))],
+ ["MemShared:", `Sequence (`Whitespace(), `memshared(`Number()), `String("^\n"))],
+ ["Buffers:", `Sequence (`Whitespace(), `buffers(`Number()), `String("^\n"))],
+ ["Cached:", `Sequence (`Whitespace(), `cached(`Number()), `String("^\n"))],
+ ["SwapCached:", `Sequence (`Whitespace(), `swapcached(`Number()), `String("^\n"))],
+ ["Active:", `Sequence (`Whitespace(), `active(`Number()), `String("^\n"))],
+ ["Inactive:", `Sequence (`Whitespace(), `inactive(`Number()), `String("^\n"))],
+ ["HighTotal:", `Sequence (`Whitespace(), `hightotal(`Number()), `String("^\n"))],
+ ["HighFree:", `Sequence (`Whitespace(), `highfree(`Number()), `String("^\n"))],
+ ["LowTotal:", `Sequence (`Whitespace(), `lowtotal(`Number()), `String("^\n"))],
+ ["LowFree:", `Sequence (`Whitespace(), `lowfree(`Number()), `String("^\n"))],
+ ["SwapTotal:", `Sequence (`Whitespace(), `swaptotal(`Number()), `String("^\n"))],
+ ["SwapFree:", `Sequence (`Whitespace(), `swapfree(`Number()), `String("^\n"))]
+ ),
+ `Continue ("\n")
+ ))
+ )
+)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/control/src/ProductControl.ycp new/yast2-2.15.23/library/control/src/ProductControl.ycp
--- old/yast2-2.15.22/library/control/src/ProductControl.ycp 2007-02-28 15:19:48.000000000 +0100
+++ new/yast2-2.15.23/library/control/src/ProductControl.ycp 2007-04-02 13:54:48.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Product Control routines
* Authors: Anas Nashif
*
- * $Id: ProductControl.ycp 36558 2007-02-28 12:33:53Z lslezak $
+ * $Id: ProductControl.ycp 37209 2007-03-29 13:47:18Z locilka $
*/
{
textdomain "base";
@@ -21,7 +21,7 @@
import "Report";
import "Hooks";
import "Popup";
-
+import "FileUtils";
// The complete parsed control file
global map productControl = $[];
@@ -722,11 +722,10 @@
/**
* Return proposal Label
*/
-global map getProposalProperties( string stage, string mode, string proptype
-)
-{
- list<map> proposals = getMatchingProposal(stage, mode, proptype);
- map proposal = proposals[0]:$[];
+global map getProposalProperties (string stage, string mode, string proptype) {
+ list <map> got_proposals = getMatchingProposal(stage, mode, proptype);
+ map proposal = got_proposals[0]:$[];
+
if (haskey (proposal, "proposal_tabs"))
{
string text_domain = productControl["textdomain"]:"control";
@@ -738,6 +737,7 @@
return tab;
});
}
+
return proposal;
}
@@ -764,8 +764,7 @@
* Initialize Product Control
* @return boolean True on success
*/
-global define boolean Init()
-{
+global define boolean Init() {
boolean ret = false;
current_control_file = "";
@@ -777,29 +776,27 @@
packaged_control_file // /usr/share/YaST2/control/control.xml
];
- if ( custom_control_file != "")
- {
- order=prepend(order, custom_control_file);
+ if ( custom_control_file != "") {
+ order=prepend (order, custom_control_file);
}
- y2milestone("Candidates: %1", order );
- foreach(string cf, order,
- {
- if ((integer)SCR::Read( .target.size, cf )>0
- && current_control_file == "")
- {
- current_control_file = cf;
+ y2milestone ("Candidates: %1", order);
+ foreach(string control_file, order, {
+ if (FileUtils::Exists (control_file) && current_control_file == "") {
+ current_control_file = control_file;
+ break;
}
});
- if (current_control_file == "")
- {
- y2error("Control file not found");
+ if (current_control_file == "") {
+ y2error ("No control file found");
+
return false;
}
- y2milestone("Reading control file: %1", current_control_file );
- ReadControlFile( current_control_file );
+ y2milestone ("Reading control file: %1", current_control_file);
+ ReadControlFile (current_control_file);
+
return (current_control_file != "");
}
@@ -807,21 +804,19 @@
* Re-translate static part of wizard dialog and other predefined messages
* after language change
*/
-void retranslateWizardDialog()
- {
- y2milestone( "Retranslating messages 1" );
+void retranslateWizardDialog() {
+ y2milestone ("Retranslating messages, redrawing wizard steps");
// Make sure the labels for default function keys are retranslated, too.
// Using Label::DefaultFunctionKeyMap() from Label module.
UI::SetFunctionKeys( Label::DefaultFunctionKeyMap() );
// Activate language changes on static part of wizard dialog
-
ProductControl::RetranslateWizardSteps();
Wizard::RetranslateButtons();
Wizard::SetFocusToNextButton();
return;
- }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/control/src/WorkflowManager.ycp new/yast2-2.15.23/library/control/src/WorkflowManager.ycp
--- old/yast2-2.15.22/library/control/src/WorkflowManager.ycp 2007-03-28 17:02:44.000000000 +0200
+++ new/yast2-2.15.23/library/control/src/WorkflowManager.ycp 2007-04-02 13:54:48.000000000 +0200
@@ -476,7 +476,7 @@
if (FileUtils::Exists (used_filename)) {
y2milestone ("Removing cached file '%1': %2",
used_filename,
- (boolean) SCR::Execute (.target.remove, used_filename)
+ SCR::Execute (.target.remove, used_filename)
);
}
}
@@ -1026,11 +1026,6 @@
return false;
}
- if (! RedrawWizardSteps ()) {
- y2error ("Redrawing the wizard steps failed");
- return false;
- }
-
if (! UpdateInstFinish (update_file["update", "inst_finish"]:$[])) {
y2error ("Adding inst_finish steps failed");
return false;
@@ -1105,4 +1100,27 @@
global boolean HaveAdditionalWorkflows () {
return (size (GetAllUsedControlFiles()) >= 0);
}
+
+ /**
+ * Returns the current settings used by WorkflowManager.
+ * This function is just for debugging purpose.
+ *
+ * @return map of current settings
+ * @struct [
+ * "workflows" : ...
+ * "proposals" : ...
+ * "inst_finish" : ...
+ * "clone_modules" : ...
+ * "unmerged_changes" : ...
+ * ];
+ */
+ global map DumpCurrentSettings () {
+ return $[
+ "workflows" : ProductControl::workflows,
+ "proposals" : ProductControl::proposals,
+ "inst_finish" : ProductControl::inst_finish,
+ "clone_modules" : ProductControl::clone_modules,
+ "unmerged_changes" : unmerged_changes,
+ ];
+ }
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/control/testsuite/tests/WorkflowManager.out new/yast2-2.15.23/library/control/testsuite/tests/WorkflowManager.out
--- old/yast2-2.15.22/library/control/testsuite/tests/WorkflowManager.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.15.23/library/control/testsuite/tests/WorkflowManager.out 2007-04-02 13:54:48.000000000 +0200
@@ -0,0 +1,20 @@
+Return nil
+Dump
+Dump Adding new Add-On product
+Return true
+Return ["/tmp/additional-control-files/3:__AddOnProduct-ControlFile__.xml"]
+Dump
+Dump Adding another Add-On product
+Return true
+Return ["/tmp/additional-control-files/3:__AddOnProduct-ControlFile__.xml", "/tmp/additional-control-files/12:__AddOnProduct-ControlFile__.xml"]
+Dump
+Dump Removing the first Add-On product
+Execute .target.remove "/tmp/additional-control-files/3:__AddOnProduct-ControlFile__.xml" 0
+Return true
+Return ["/tmp/additional-control-files/12:__AddOnProduct-ControlFile__.xml"]
+Dump
+Dump Removing the first Add-On product
+Return true
+Dump
+Dump Current Settings
+Return $["clone_modules":[], "inst_finish":[], "proposals":[$["archs":"", "mode":"installation", "name":"initial", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"], "proposal_tabs":[$["label":"Overview", "proposal_modules":["partitions", "software_simple", "language_simple"]], $["label":"Expert", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"]]], "stage":"initial"], $["archs":"", "mode":"demo", "name":"initial", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"], "proposal_tabs":[$["label":"Overview", "proposal_modules":["partitions", "software_simple", "language_simple"]], $["label":"Expert", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"]]], "stage":"initial"], $["archs":"", "mode":"autoinstallation", "name":"initial", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"], "proposal_tabs":[$["label":"Overview", "proposal_modules":["partitions", "software_simple", "language_simple"]], $["label":"Expert", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"]]], "stage":"initial"], $["archs":"", "mode":"", "name":"network", "proposal_modules":[$["name":"lan", "presentation_order":"20"], $["name":"dsl", "presentation_order":"30"], $["name":"isdn", "presentation_order":"40"], $["name":"modem", "presentation_order":"50"], $["name":"remote", "presentation_order":"60"], $["name":"firewall", "presentation_order":"10"], $["name":"proxy", "presentation_order":"70"]], "stage":"continue"], $["archs":"", "mode":"", "name":"network", "proposal_modules":[$["name":"lan", "presentation_order":"20"], $["name":"dsl", "presentation_order":"30"], $["name":"isdn", "presentation_order":"40"], $["name":"modem", "presentation_order":"50"], $["name":"remote", "presentation_order":"60"], $["name":"firewall", "presentation_order":"10"], $["name":"proxy", "presentation_order":"70"]], "stage":"normal"]], "unmerged_changes":false, "workflows":[$["defaults":$["archs":"i386"], "label":"Preparation", "mode":"installation", "modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]], "stage":"initial"], $["defaults":$["archs":"x86_64"], "label":"Preparation", "mode":"installation", "modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]], "stage":"initial"], $["defaults":$["archs":"i386"], "label":"Preparation", "mode":"update", "modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]], "stage":"initial"], $["defaults":$["archs":"x86_64"], "label":"Preparation", "mode":"update", "modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]], "stage":"initial"]]]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/control/testsuite/tests/WorkflowManager.ycp new/yast2-2.15.23/library/control/testsuite/tests/WorkflowManager.ycp
--- old/yast2-2.15.22/library/control/testsuite/tests/WorkflowManager.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.15.23/library/control/testsuite/tests/WorkflowManager.ycp 2007-04-02 13:54:48.000000000 +0200
@@ -0,0 +1,56 @@
+{
+
+// testedfiles: WorkflowManager.ycp
+
+include "testsuite.ycp";
+
+map READ = $[
+ "target" : $[
+ "size" : 0,
+ ],
+];
+
+map WRITE = $[];
+
+map EXEC = $[];
+
+TESTSUITE_INIT([READ, WRITE, EXEC], nil);
+
+import "WorkflowManager";
+import "ProductControl";
+
+// init -->
+ProductControl::workflows = [$["defaults":$["archs":"i386"],"label":"Preparation","mode":"installation","modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]], "stage":"initial"], $["defaults":$["archs":"x86_64"], "label":"Preparation", "mode":"installation", "modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]], "stage":"initial"], $["defaults":$["archs":"i386"], "label":"Preparation", "mode":"update", "modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]], "stage":"initial"], $["defaults":$["archs":"x86_64"], "label":"Preparation", "mode":"update", "modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]],"stage":"initial"]];
+WorkflowManager::PrepareSystemWorkflows();
+
+ProductControl::proposals = [$["archs":"", "mode":"installation", "name":"initial", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"], "proposal_tabs":[$["label":"Overview", "proposal_modules":["partitions", "software_simple", "language_simple"]], $["label":"Expert", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"]]], "stage":"initial"], $["archs":"", "mode":"demo", "name":"initial", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"], "proposal_tabs":[$["label":"Overview", "proposal_modules":["partitions", "software_simple", "language_simple"]], $["label":"Expert", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"]]], "stage":"initial"], $["archs":"", "mode":"autoinstallation", "name":"initial", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"], "proposal_tabs":[$["label":"Overview", "proposal_modules":["partitions", "software_simple", "language_simple"]], $["label":"Expert", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"]]], "stage":"initial"], $["archs":"", "mode":"", "name":"network", "proposal_modules":[$["name":"lan", "presentation_order":"20"], $["name":"dsl", "presentation_order":"30"], $["name":"isdn", "presentation_order":"40"], $["name":"modem", "presentation_order":"50"], $["name":"remote", "presentation_order":"60"], $["name":"firewall", "presentation_order":"10"], $["name":"proxy", "presentation_order":"70"]], "stage":"continue"], $["archs":"", "mode":"", "name":"network", "proposal_modules":[$["name":"lan", "presentation_order":"20"], $["name":"dsl", "presentation_order":"30"], $["name":"isdn", "presentation_order":"40"], $["name":"modem", "presentation_order":"50"], $["name":"remote", "presentation_order":"60"], $["name":"firewall", "presentation_order":"10"], $["name":"proxy", "presentation_order":"70"]], "stage":"normal"]];
+WorkflowManager::PrepareSystemProposals();
+// init <--
+
+
+TEST (``(WorkflowManager::SetBaseWorkflow (false)), [], nil);
+
+DUMP ("");
+DUMP ("Adding new Add-On product");
+TEST (``(WorkflowManager::AddWorkflow (`addon, 3, "")), [], nil);
+TEST (``(WorkflowManager::GetAllUsedControlFiles ()), [], nil);
+
+DUMP ("");
+DUMP ("Adding another Add-On product");
+TEST (``(WorkflowManager::AddWorkflow (`addon, 12, "")), [], nil);
+TEST (``(WorkflowManager::GetAllUsedControlFiles ()), [], nil);
+
+DUMP ("");
+DUMP ("Removing the first Add-On product");
+TEST (``(WorkflowManager::RemoveWorkflow (`addon, 3, "")), [], nil);
+TEST (``(WorkflowManager::GetAllUsedControlFiles ()), [], nil);
+
+DUMP ("");
+DUMP ("Removing the first Add-On product");
+TEST (``(WorkflowManager::MergeWorkflows ()), [READ, WRITE, EXEC], nil);
+
+DUMP ("");
+DUMP ("Current Settings");
+TEST (``(WorkflowManager::DumpCurrentSettings ()), [], nil);
+
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/modules/Version.ycp new/yast2-2.15.23/library/modules/Version.ycp
--- old/yast2-2.15.22/library/modules/Version.ycp 2007-03-28 17:12:01.000000000 +0200
+++ new/yast2-2.15.23/library/modules/Version.ycp 2007-04-02 14:43:33.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.15.22";
+global string yast2 = "2.15.23";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/network/src/SuSEFirewallProposal.ycp new/yast2-2.15.23/library/network/src/SuSEFirewallProposal.ycp
--- old/yast2-2.15.22/library/network/src/SuSEFirewallProposal.ycp 2007-03-06 13:54:32.000000000 +0100
+++ new/yast2-2.15.23/library/network/src/SuSEFirewallProposal.ycp 2007-04-02 13:54:49.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Functional interface for SuSEFirewall installation proposal
* Authors: Lukas Ocilka
*
- * $Id: SuSEFirewallProposal.ycp 36740 2007-03-06 12:54:30Z locilka $
+ * $Id: SuSEFirewallProposal.ycp 37245 2007-04-02 09:10:55Z locilka $
*
* This module provides a functional API for Installation proposal of SuSEfirewall2
*/
@@ -389,15 +389,15 @@
boolean firewall_is_enabled = (SuSEFirewall::GetEnableService() == true);
output = output + "<ul>\n";
- output = output + (firewall_is_enabled ?
- // TRANSLATORS: Proposal informative text "Firewall is enabled" with link around
+ output = output + "<li>" + (firewall_is_enabled ?
+ // TRANSLATORS: Proposal informative text "Firewall is enabled (disable)" with link around
// IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
- _("Firewall is enabled</a>")
+ _("Firewall is enabled (disable</a>)")
:
- // TRANSLATORS: Proposal informative text "Firewall is disabled" with link around
+ // TRANSLATORS: Proposal informative text "Firewall is disabled (enable)" with link around
// IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
- _("Firewall is disabled</a>")
- );
+ _("Firewall is disabled (enable</a>)")
+ ) + "</li>\n";
if (firewall_is_enabled) {
// Any enabled SSH means SSH-is-enabled
@@ -417,15 +417,15 @@
}
});
- output = output + "<br>" + (is_ssh_enabled ?
+ output = output + "<li>" + (is_ssh_enabled ?
// TRANSLATORS: Network proposal informative text with link around
// IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
- _("SSH port is open</a>")
+ _("SSH port is open (close</a>)")
:
// TRANSLATORS: Network proposal informative text with link around
// IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
- _("SSH port is blocked</a>")
- );
+ _("SSH port is blocked (open</a>)")
+ ) + "</li>\n";
// No known interfaces, but 'any' is supported
// and ssh is enabled there
@@ -436,7 +436,7 @@
is_ssh_enabled = true;
// TRANSLATORS: Network proposal informative text with link around
// IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
- output = output + "<br>" + _("SSH port is open</a>, but there are still no network interfaces configured");
+ output = output + "<li>" + _("SSH port is open (close</a>), but there are still no network interfaces configured") + "</li>";
}
y2milestone("SSH is " + (is_ssh_enabled ? "":"not ") + "enabled");
@@ -458,15 +458,15 @@
}
y2milestone("VNC port is " + (is_vnc_enabled ? "open":"blocked") + " in the firewall");
- output = output + "<br>" + (is_vnc_enabled ?
+ output = output + "<li>" + (is_vnc_enabled ?
// TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is enabled" with link around
// IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
- _("Remote Administration (VNC) ports are open</a>")
+ _("Remote Administration (VNC) ports are open (close</a>)")
:
// TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is disabled" with link around
// IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
- _("Remote Administration (VNC) ports are blocked</a>")
- );
+ _("Remote Administration (VNC) ports are blocked (open</a>)")
+ ) + "</li>\n";
if (!is_vnc_enabled)
// TRANSLATORS: This is a warning message. Installation over VNC without VNC allowed on firewall
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/packages/src/PackageCallbacksInit.ycp new/yast2-2.15.23/library/packages/src/PackageCallbacksInit.ycp
--- old/yast2-2.15.22/library/packages/src/PackageCallbacksInit.ycp 2007-02-16 09:06:20.000000000 +0100
+++ new/yast2-2.15.23/library/packages/src/PackageCallbacksInit.ycp 2007-04-02 14:14:05.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Initialize packager callbacks
* Authors: Jiri Srain
*
- * $Id: PackageCallbacksInit.ycp 36165 2007-02-15 06:48:08Z lslezak $
+ * $Id: PackageCallbacksInit.ycp 37248 2007-04-02 12:14:01Z lslezak $
*
* This module is used to initialize package manager callbacks
*/
@@ -82,6 +82,8 @@
Pkg::CallbackSourceCreateProgress("PackageCallbacks::SourceCreateProgress");
Pkg::CallbackSourceCreateError("PackageCallbacks::SourceCreateError");
Pkg::CallbackSourceCreateEnd("PackageCallbacks::SourceCreateEnd");
+ Pkg::CallbackSourceCreateInit("PackageCallbacks::SourceCreateInit");
+ Pkg::CallbackSourceCreateDestroy("PackageCallbacks::SourceCreateDestroy");
// source probing callbacks
Pkg::CallbackSourceProbeStart("PackageCallbacks::SourceProbeStart");
@@ -96,6 +98,8 @@
Pkg::CallbackSourceReportProgress("PackageCallbacks::SourceReportProgress");
Pkg::CallbackSourceReportError("PackageCallbacks::SourceReportError");
Pkg::CallbackSourceReportEnd("PackageCallbacks::SourceReportEnd");
+ Pkg::CallbackSourceReportInit("PackageCallbacks::SourceReportInit");
+ Pkg::CallbackSourceReportDestroy("PackageCallbacks::SourceReportDestroy");
// @see bugzilla #183821
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/scripts/yast2 new/yast2-2.15.23/scripts/yast2
--- old/yast2-2.15.22/scripts/yast2 2007-03-23 13:36:03.000000000 +0100
+++ new/yast2-2.15.23/scripts/yast2 2007-04-02 14:42:32.000000000 +0200
@@ -269,7 +269,6 @@
fi
done
else
- while true ; do
# Transform every argument into a ycp string, that is surround all
# args by ("..."). args may contain spaces.
a=("$@")
@@ -277,6 +276,7 @@
c=("${b[@]/%/\")}")
set -- "${c[@]}"
+ while true ; do
$ybindir/y2base "$module" "$@" ncurses $NCTHREADS
if [ ! $module == "online_update" -o ! -e "/var/lib/YaST2/selected_patches.ycp" ] ; then
break
@@ -305,7 +305,6 @@
$y2ccbin $Y2QT_ARGS "$@"
else
- while true ; do
# Special case: "sw_single" needs a lot of screen space -
# always start it in full screen mode.
#
@@ -333,6 +332,7 @@
c=("${b[@]/%/\")}")
set -- "${c[@]}"
+ while true ; do
$ybindir/y2base $module "$@" "$SELECTED_GUI" $Y2_GEOMETRY $Y2QT_ARGS
if [ ! $module == "online_update" -o ! -e "/var/lib/YaST2/selected_patches.ycp" ] ; then
break
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/VERSION new/yast2-2.15.23/VERSION
--- old/yast2-2.15.22/VERSION 2007-03-28 17:09:31.000000000 +0200
+++ new/yast2-2.15.23/VERSION 2007-04-02 14:42:32.000000000 +0200
@@ -1 +1 @@
-2.15.22
+2.15.23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org