Hello community,
here is the log from the commit of package yast2
checked in at Fri Mar 9 01:52:10 CET 2007.
--------
--- yast2/yast2.changes 2007-03-05 10:58:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-03-08 18:28:56.767744000 +0100
@@ -1,0 +2,37 @@
+Thu Mar 8 18:21:35 CET 2007 - jsuchome@suse.cz
+
+- added SLPAPI.pm, Perl API for SLP agent (#238680)
+- 2.15.17
+
+-------------------------------------------------------------------
+Thu Mar 8 16:57:17 CET 2007 - locilka@suse.cz
+
+- Module GetInstArgs moved from yast2-installation to yast2, many
+ clients required yast2-installation only because of this module.
+- Added documentation of functions into that module.
+
+-------------------------------------------------------------------
+Thu Mar 8 16:30:09 CET 2007 - jsrain@suse.cz
+
+- added xinetd support to the CWM service start widget
+
+-------------------------------------------------------------------
+Wed Mar 7 13:26:03 CET 2007 - jsrain@suse.cz
+
+- build correctly URL in case of multiple leading slashes in the
+ path (#179623)
+
+-------------------------------------------------------------------
+Tue Mar 6 22:25:24 CET 2007 - locilka@suse.cz
+
+- Adding more documentation into the FileUtils module (examples).
+
+-------------------------------------------------------------------
+Tue Mar 6 13:49:56 CET 2007 - locilka@suse.cz
+
+- When updating the SuSEfirewall2 network interfaces, consider that
+ interfaces needn't be assigned to zones only by SuSEFirewall but
+ also by network modules. Do not change assignments which have
+ been made already.
+
+-------------------------------------------------------------------
Old:
----
yast2-2.15.16.tar.bz2
New:
----
yast2-2.15.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.vX7066/_old 2007-03-09 01:52:00.000000000 +0100
+++ /var/tmp/diff_new_pack.vX7066/_new 2007-03-09 01:52:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.15.16)
+# spec file for package yast2 (Version 2.15.17)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2
-Version: 2.15.16
+Version: 2.15.17
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.15.16.tar.bz2
+Source0: yast2-2.15.17.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
# SCR::RegisterNewAgents()
@@ -96,7 +96,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.15.16
+%setup -n yast2-2.15.17
%build
%{prefix}/bin/y2tool y2autoconf
@@ -201,6 +201,25 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Thu Mar 08 2007 - jsuchome@suse.cz
+- added SLPAPI.pm, Perl API for SLP agent (#238680)
+- 2.15.17
+* Thu Mar 08 2007 - locilka@suse.cz
+- Module GetInstArgs moved from yast2-installation to yast2, many
+ clients required yast2-installation only because of this module.
+- Added documentation of functions into that module.
+* Thu Mar 08 2007 - jsrain@suse.cz
+- added xinetd support to the CWM service start widget
+* Wed Mar 07 2007 - jsrain@suse.cz
+- build correctly URL in case of multiple leading slashes in the
+ path (#179623)
+* Tue Mar 06 2007 - locilka@suse.cz
+- Adding more documentation into the FileUtils module (examples).
+* Tue Mar 06 2007 - locilka@suse.cz
+- When updating the SuSEfirewall2 network interfaces, consider that
+ interfaces needn't be assigned to zones only by SuSEFirewall but
+ also by network modules. Do not change assignments which have
+ been made already.
* Mon Mar 05 2007 - locilka@suse.cz
- fixed SuSEFirewall testsuite
- 2.15.16
++++++ yast2-2.15.16.tar.bz2 -> yast2-2.15.17.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.16/library/control/src/GetInstArgs.ycp new/yast2-2.15.17/library/control/src/GetInstArgs.ycp
--- old/yast2-2.15.16/library/control/src/GetInstArgs.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.15.17/library/control/src/GetInstArgs.ycp 2007-03-08 18:06:40.000000000 +0100
@@ -0,0 +1,139 @@
+/**
+ * File: modules/GetInstArgs.ycp
+ * Package: yast2
+ * Summary: Get client arguments
+ * Authors: Anas Nashif
+ *
+ * $Id: GetInstArgs.ycp 36796 2007-03-08 16:00:08Z locilka $
+ */
+
+
+{
+
+ /***
+ * This module should be used in installation YCP scripts
+ * to get information how the client was called and how
+ * should it behave. This module provides a functional
+ * API to the script parametes.
+ *
+ * @example
+ * inst_language ($["enable_back":false, "enable_next":true, "first_run":"yes"])
+ * GetInstArgs::enable_next() -> true
+ * GetInstArgs::enable_back() -> false
+ */
+
+ module "GetInstArgs";
+
+ map args = $[];
+ void Init () {
+ /* Check arguments */
+ args = $[];
+ if(size(WFM::Args()) > 0 && is(WFM::Args(0), map))
+ {
+ args = (map) WFM::Args(0);
+ }
+ }
+
+ /**
+ * Should be the [Next] button enabled?
+ *
+ * @return boolean whether enabled or not
+ */
+ global boolean enable_next() {
+ Init();
+ return args["enable_next"]:false;
+ }
+
+ /**
+ * Should be the [Back] button enabled?
+ *
+ * @return boolean whether enabled or not
+ */
+ global boolean enable_back() {
+ Init();
+ return args["enable_back"]:false;
+ }
+
+ /**
+ * Are we going back from the previous dialog?
+ *
+ * @return boolean whether going_back or not
+ */
+ global boolean going_back() {
+ Init();
+ return args["going_back"]:false;
+ }
+
+ /**
+ * Returns name of the proposal
+ *
+ * @return string proposal name
+ *
+ * @example
+ * GetInstArgs::proposal() -> "initial"
+ * GetInstArgs::proposal() -> "network"
+ * GetInstArgs::proposal() -> "hardware"
+ */
+ global string proposal() {
+ Init();
+ return args["proposal"]:"";
+ }
+
+ /**
+ * Returns map of client parameters
+ *
+ * @return map of parameters
+ *
+ * @example
+ * GetInstArgs::argmap() -> $[
+ * "enable_back" : true,
+ * "enable_next" : true,
+ * "going_back" : true,
+ * "anything" : "yes, of course",
+ * ]
+ */
+ global map argmap () {
+ Init();
+ return args;
+ }
+
+ /**
+ * Returns map of client parameters only with keys:
+ * "enable_back", "enable_next", and "proposal"
+ *
+ * @return map of parameters
+ *
+ * @example
+ * GetInstArgs::ButtonsProposal() -> $[
+ * "enable_back" : true,
+ * "enable_next" : true,
+ * "proposal" : "initial"
+ * ]
+ */
+ global map ButtonsProposal (boolean back, boolean next, string proposal_name) {
+ map _args = $[];
+ _args["enable_back"] = back;
+ _args["enable_next"] = next;
+ _args["proposal"] = proposal_name;
+ return _args;
+ }
+
+ /**
+ * Returns map of client parameters only with keys:
+ * "enable_back" and "enable_next"
+ *
+ * @return map of parameters
+ *
+ * @example
+ * GetInstArgs::Buttons() -> $[
+ * "enable_back" : false,
+ * "enable_next" : true
+ * ]
+ */
+ global map Buttons (boolean back, boolean next) {
+ map _args = $[];
+ _args["enable_back"] = back;
+ _args["enable_next"] = next;
+ return _args;
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.16/library/control/src/Makefile.am new/yast2-2.15.17/library/control/src/Makefile.am
--- old/yast2-2.15.16/library/control/src/Makefile.am 2006-11-01 10:28:05.000000000 +0100
+++ new/yast2-2.15.17/library/control/src/Makefile.am 2007-03-08 18:06:40.000000000 +0100
@@ -7,7 +7,8 @@
module_DATA = \
ProductControl.ycp \
ProductFeatures.ycp \
- Hooks.ycp
+ Hooks.ycp \
+ GetInstArgs.ycp
EXTRA_DIST = $(module_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.16/library/control/src/Makefile.in new/yast2-2.15.17/library/control/src/Makefile.in
--- old/yast2-2.15.16/library/control/src/Makefile.in 2007-03-05 10:58:56.000000000 +0100
+++ new/yast2-2.15.17/library/control/src/Makefile.in 2007-03-08 18:07:28.000000000 +0100
@@ -181,7 +181,8 @@
module_DATA = \
ProductControl.ycp \
ProductFeatures.ycp \
- Hooks.ycp
+ Hooks.ycp \
+ GetInstArgs.ycp
EXTRA_DIST = $(module_DATA)
YCPCFLAGS = -M ../../modules -M ../../xml/src -M ../../wizard/src -M ../../types/src
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.16/library/cwm/src/CWMServiceStart.ycp new/yast2-2.15.17/library/cwm/src/CWMServiceStart.ycp
--- old/yast2-2.15.16/library/cwm/src/CWMServiceStart.ycp 2006-11-01 10:28:11.000000000 +0100
+++ new/yast2-2.15.17/library/cwm/src/CWMServiceStart.ycp 2007-03-08 18:06:46.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Routines for service start widget handling
* Authors: Jiri Srain
*
- * $Id: CWMServiceStart.ycp 23465 2005-05-18 13:59:02Z jsrain $
+ * $Id: CWMServiceStart.ycp 36793 2007-03-08 15:36:10Z jsrain $
*
*/
@@ -125,6 +125,16 @@
auto_start
? "_cwm_startup_auto"
: "_cwm_startup_manual");
+ if (haskey (widget, "get_service_start_via_xinetd"))
+ {
+ boolean() start_via_xinetd = (boolean())
+ widget["get_service_start_via_xinetd"]:nil;
+ if (start_via_xinetd ())
+ {
+ UI::ChangeWidget (`id ("_cwm_service_startup"), `CurrentButton,
+ "_cwm_startup_xinetd");
+ }
+ }
}
/**
@@ -145,6 +155,15 @@
void(boolean) set_auto_start
= (void(boolean))widget["set_service_auto_start"]:nil;
set_auto_start(auto_start);
+ if ((! auto_start) && haskey (widget, "set_service_start_via_xinetd"))
+ {
+ void(boolean) start_via_xinetd = (void(boolean))
+ widget["set_service_start_via_xinetd"]:nil;
+ start_via_xinetd (
+ UI::QueryWidget (`id ("_cwm_service_startup"), `CurrentButton)
+ == "_cwm_startup_xinetd"
+ );
+ }
}
/**
@@ -180,6 +199,23 @@
}
/**
+ * Get the template for the help text to the auto start widget
+ * @return string help text template with %1 and %2 placeholders
+ */
+global string AutoStartHelpXinetdTemplate () {
+ // help text for service auto start widget
+ // %1, %2 and %3 are button labels
+ // %1 is eg. "On -- Start Service when Booting"
+ // %2 is eg. "Off -- Start Service Manually"
+ // %3 is eg. "Start Service via xinetd"
+ // (both without quotes)
+ return _("<p><b><big>Service Start</big></b><br>
+To start the service every time your computer is booted, set
+<b>%1</b>. To start the service via the xinetd daemon, set <b>%3</b>.
+Otherwise set <b>%2</b>.</p>");
+}
+
+/**
* Get the help text to the auto start widget
* @return string help text
*/
@@ -192,6 +228,20 @@
}
/**
+ * Get the help text to the auto start widget
+ * @return string help text
+ */
+global string AutoStartXinetdHelp () {
+ return sformat (AutoStartHelpTemplate (),
+ // part of help text - radio button label, NO SHORTCUT!!!
+ _("During Boot"),
+ // part of help text - radio button label, NO SHORTCUT!!!
+ _("Manually"),
+ // part of help text - radio button label, NO SHORTCUT!!!
+ _("Via xinetd"));
+}
+
+/**
* Get the widget description map of the widget for service auto starting
* settings
* @param settings a map of all parameters needed to create the widget properly
@@ -202,8 +252,17 @@
* - "set_service_auto_start" : void (boolean) -- function that takes as
* an argument boolean value saying if the service is started
* automatically during booting
+ * - "get_service_start_via_xinetd" : boolean () -- function that returns if
+ * the service is to be started via xinetd. At most one of this
+ * function and "get_service_auto_start" returns true (if started
+ * via xinetd, not starting automatically
+ * - "set_service_start_via_xinetd" : void (boolean) - function that takes
+ * as an argument boolean value saying if the service is started
+ * via xinetd
* - "start_auto_button" : string -- label of the radio button to start
* the service automatically when booting
+ * - "start_xinetd_button" : string -- label of the radio button to start
+ * the service via xinetd
* - "start_manual_button" : string -- label of the radio button to start
* the service only manually
* - "help" : string -- custom help for the widget. If not specified, generic
@@ -224,29 +283,42 @@
string start_manual_button
// radio button
= settings["start_manual_button"]:_("Manually");
+ string start_xinetd_button
+ // radio button
+ = settings["start_xinetd_button"]:_("Via &xinetd");
+ boolean xinetd_available =
+ haskey (settings, "get_service_start_via_xinetd");
if (haskey (settings, "help"))
{
help = settings["help"]:"";
}
else
{
- help = AutoStartHelp ();
+ help = xinetd_available ? AutoStartXinetdHelp () : AutoStartHelp ();
}
+ term items = `VBox (
+ `VSpacing (0.4),
+ `Left (`RadioButton (`id ("_cwm_startup_auto"),
+ `opt (`notify),
+ start_auto_button))
+
+ );
+ if (xinetd_available)
+ {
+ items = add (items, `Left (`RadioButton (`id ("_cwm_startup_xinetd"),
+ `opt (`notify),
+ start_xinetd_button)));
+ }
+ items = add (items, `Left (`RadioButton (`id ("_cwm_startup_manual"),
+ `opt (`notify),
+ start_manual_button)));
+ items = add (items, `VSpacing (0.4));
// Frame label (service starting)
term booting = `VBox (
// frame
`Frame (_("Service Start"),
- `Left (`RadioButtonGroup (`id ("_cwm_service_startup"), `VBox (
- `VSpacing (0.4),
- `Left (`RadioButton (`id ("_cwm_startup_auto"),
- `opt (`notify),
- start_auto_button)),
- `Left (`RadioButton (`id ("_cwm_startup_manual"),
- `opt (`notify),
- start_manual_button)),
- `VSpacing (0.4)
- )))
+ `Left (`RadioButtonGroup (`id ("_cwm_service_startup"), items))
)
);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.16/library/modules/FileUtils.ycp new/yast2-2.15.17/library/modules/FileUtils.ycp
--- old/yast2-2.15.16/library/modules/FileUtils.ycp 2006-11-01 10:28:25.000000000 +0100
+++ new/yast2-2.15.17/library/modules/FileUtils.ycp 2007-03-08 18:07:00.000000000 +0100
@@ -7,7 +7,7 @@
* removing them.
* Flags: Stable
*
- * $Id: FileUtils.ycp 33224 2006-10-02 14:17:13Z jsrain $
+ * $Id: FileUtils.ycp 36754 2007-03-06 21:26:30Z locilka $
*/
{
module "FileUtils";
@@ -22,6 +22,10 @@
*
* @return true if exists
* @param string file name
+ *
+ * @example
+ * FileUtils::Exists ("/tmp") -> true
+ * FileUtils::Exists ("/tmp/somefile") -> false
*/
global define boolean Exists (string target) {
map info = (map) SCR::Read(.target.stat, target);
@@ -38,6 +42,11 @@
*
* @return true if it is a directory, nil if doesn't exist
* @param string file name
+ *
+ * @example
+ * FileUtils::IsDirectory ("/var") -> true
+ * FileUtils::IsDirectory ("/var/log/messages") -> false
+ * FileUtils::IsDirectory ("/does-not-exist") -> nil
*/
global define boolean IsDirectory (string target) {
map info = (map) SCR::Read(.target.stat, target);
@@ -52,6 +61,11 @@
*
* @return true if it is a regular file, nil if doesn't exist
* @param string file name
+ *
+ * @example
+ * FileUtils::IsFile ("/var") -> false
+ * FileUtils::IsFile ("/var/log/messages") -> true
+ * FileUtils::IsFile ("/does-not-exist") -> nil
*/
global define boolean IsFile (string target) {
map info = (map) SCR::Read(.target.stat, target);
@@ -66,6 +80,11 @@
*
* @return true if it is a block file, nil if doesn't exist
* @param string file name
+ *
+ * @example
+ * FileUtils::IsBlock ("/var") -> false
+ * FileUtils::IsBlock ("/dev/sda2") -> true
+ * FileUtils::IsBlock ("/dev/does-not-exist") -> nil
*/
global define boolean IsBlock (string target) {
map info = (map) SCR::Read(.target.stat, target);
@@ -133,8 +152,13 @@
* Function returns the real type of requested file/directory.
* If the file is a link to any object, "link" is returned.
*
- * @return string fle type (directory|regular|block|fifo|link|socket|chr_device), nil if doesn't exist
+ * @return string file type (directory|regular|block|fifo|link|socket|chr_device), nil if doesn't exist
* @param string file name
+ *
+ * @example
+ * FileUtils::GetFileRealType ("/var") -> "directory"
+ * FileUtils::GetFileRealType ("/etc/passwd") -> "file"
+ * FileUtils::GetFileRealType ("/does-not-exist") -> nil
*/
global define string GetFileRealType (string target) {
map info = (map) SCR::Read(.target.lstat, target);
@@ -193,6 +217,10 @@
*
* @return integer file size, -1 if doesn't exist
* @param string file name
+ *
+ * @example
+ * FileUtils::GetSize ("/var/log/YaST2") -> 12348
+ * FileUtils::GetSize ("/does-not-exist") -> -1
*/
global define integer GetSize (string target) {
return (integer) SCR::Read(.target.size, target);
@@ -203,6 +231,10 @@
*
* @return integer UID, nil if doesn't exist
* @param string file name
+ *
+ * @example
+ * FileUtils::GetOwnerUserID ("/etc/passwd") -> 0
+ * FileUtils::GetOwnerUserID ("/does-not-exist") -> nil
*/
global define integer GetOwnerUserID (string target) {
map info = (map) SCR::Read(.target.stat, target);
@@ -215,6 +247,10 @@
*
* @return integer GID, nil if doesn't exist
* @param string file name
+ *
+ * @example
+ * FileUtils::GetOwnerGroupID ("/etc/passwd") -> 0
+ * FileUtils::GetOwnerGroupID ("/does-not-exist") -> nil
*/
global define integer GetOwnerGroupID (string target) {
map info = (map) SCR::Read(.target.stat, target);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.16/library/modules/Version.ycp new/yast2-2.15.17/library/modules/Version.ycp
--- old/yast2-2.15.16/library/modules/Version.ycp 2007-03-05 10:59:05.000000000 +0100
+++ new/yast2-2.15.17/library/modules/Version.ycp 2007-03-08 18:22:09.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.15.16";
+global string yast2 = "2.15.17";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.16/library/network/src/Makefile.am new/yast2-2.15.17/library/network/src/Makefile.am
--- old/yast2-2.15.16/library/network/src/Makefile.am 2006-11-01 10:28:16.000000000 +0100
+++ new/yast2-2.15.17/library/network/src/Makefile.am 2007-03-08 18:12:52.000000000 +0100
@@ -17,6 +17,7 @@
PortAliases.ycp \
PortRanges.ycp \
SuSEFirewallProposal.ycp \
+ SLPAPI.pm \
CWMFirewallInterfaces.ycp
EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.16/library/network/src/Makefile.in new/yast2-2.15.17/library/network/src/Makefile.in
--- old/yast2-2.15.16/library/network/src/Makefile.in 2007-03-05 10:58:59.000000000 +0100
+++ new/yast2-2.15.17/library/network/src/Makefile.in 2007-03-08 18:13:04.000000000 +0100
@@ -193,6 +193,7 @@
PortAliases.ycp \
PortRanges.ycp \
SuSEFirewallProposal.ycp \
+ SLPAPI.pm \
CWMFirewallInterfaces.ycp
EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.16/library/network/src/SLPAPI.pm new/yast2-2.15.17/library/network/src/SLPAPI.pm
--- old/yast2-2.15.16/library/network/src/SLPAPI.pm 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.15.17/library/network/src/SLPAPI.pm 2007-03-08 18:12:26.000000000 +0100
@@ -0,0 +1,35 @@
+#
+# SLPAPI.pm
+# wrapper for SPL.ycp functions, included in yast2-slp package
+#
+
+package SLPAPI;
+
+use strict;
+use YaST::YCP qw(:LOGGING Boolean sformat);;
+#use YaPI;
+use Data::Dumper;
+
+YaST::YCP::Import ("SLP");
+
+our %TYPEINFO;
+
+use strict;
+#use Errno qw(ENOENT);
+
+
+# Issue the query for services
+# @param pcServiceType The Service Type String, including authority string if
+# any, for the request, such as can be discovered using SLPSrvTypes().
+# This could be, for example "service:printer:lpr" or "service:nfs".
+# @param pcScopeList comma separated list of scope names to search for
+# service types.
+# @return list<map> List of Services
+BEGIN{ $TYPEINFO{FindSrvs} = ["function", ["list", ["map", "string", "any"] ], "string", "string"];}
+sub FindSrvs {
+
+ my ($self, $pcServiceType, $pcScopeList) = @_;
+ return SLP->FindSrvs ($pcServiceType, $pcScopeList);
+}
+
+42
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.16/library/network/src/SuSEFirewallProposal.ycp new/yast2-2.15.17/library/network/src/SuSEFirewallProposal.ycp
--- old/yast2-2.15.16/library/network/src/SuSEFirewallProposal.ycp 2007-02-28 17:23:18.000000000 +0100
+++ new/yast2-2.15.17/library/network/src/SuSEFirewallProposal.ycp 2007-03-08 18:06:51.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Functional interface for SuSEFirewall installation proposal
* Authors: Lukas Ocilka
*
- * $Id: SuSEFirewallProposal.ycp 36588 2007-02-28 16:23:15Z locilka $
+ * $Id: SuSEFirewallProposal.ycp 36740 2007-03-06 12:54:30Z locilka $
*
* This module provides a functional API for Installation proposal of SuSEfirewall2
*/
@@ -127,8 +127,10 @@
});
foreach (string interface, currently_known_interfaces, {
- // already configured
+ // already known but not assigned
if (contains(last_known_interfaces, interface)) return;
+ // already configured in some zone
+ if (SuSEFirewall::GetZoneOfInterface(interface) != nil) return;
// any dial-up interfaces presented and the new one isn't dial-up
if (had_dialup_interfaces && ! IsDialUpInterface(interface)) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.16/library/types/src/URL.ycp new/yast2-2.15.17/library/types/src/URL.ycp
--- old/yast2-2.15.16/library/types/src/URL.ycp 2007-02-19 10:00:42.000000000 +0100
+++ new/yast2-2.15.17/library/types/src/URL.ycp 2007-03-08 18:06:57.000000000 +0100
@@ -6,7 +6,7 @@
* Anas Nashif
* Flags: Stable
*
- * $Id: URL.ycp 36213 2007-02-16 12:02:08Z lslezak $
+ * $Id: URL.ycp 36762 2007-03-07 12:27:35Z jsrain $
*/
{
@@ -312,6 +312,8 @@
url = sformat("%1/%2", url, EscapeString(tokens["path"]:"", transform_map_filename));
else if (tokens["path"]:"" != "" && find (tokens["path"]:"", "/") == 0 )
{
+ while (substring (tokens["path"]:"", 0, 2) == "//")
+ tokens["path"] = substring (tokens["path"]:"", 1);
if (tokens["scheme"]:"" == "ftp") {
url = sformat("%1/%%2f%2", url, substring(EscapeString(tokens["path"]:"", transform_map_filename), 1));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.16/library/types/testsuite/tests/URL.out new/yast2-2.15.17/library/types/testsuite/tests/URL.out
--- old/yast2-2.15.16/library/types/testsuite/tests/URL.out 2007-02-19 10:00:42.000000000 +0100
+++ new/yast2-2.15.17/library/types/testsuite/tests/URL.out 2007-03-08 18:06:58.000000000 +0100
@@ -17,6 +17,10 @@
Return http://name:pass@www.suse.cz:80/path/index.html?question#part
Return http://na%40me:pa%3f%3fss@www.suse.cz:80/path/index.html?question#part
Return http://user%40domain:pass@www.suse.cz:80/path/index.html?question#part
+Return ftp://ftp.example.com/path/to/dir
+Return ftp://ftp.example.com/%2fpath/to/dir
+Return ftp://ftp.example.com/%2fpath/to/dir
+Return ftp://ftp.example.com/%2fpath/to/dir
Return http://download.opensuse.org/very/log/path/which/will/be/truncated/target_fi...
Return http://download.opensuse.org/.../target_file
Return http://download.opensuse.org/.../target_file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.16/library/types/testsuite/tests/URL.ycp new/yast2-2.15.17/library/types/testsuite/tests/URL.ycp
--- old/yast2-2.15.16/library/types/testsuite/tests/URL.ycp 2007-02-19 10:00:42.000000000 +0100
+++ new/yast2-2.15.17/library/types/testsuite/tests/URL.ycp 2007-03-08 18:06:58.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: XXXXXX
* Author: Michal Svec
*
- * $Id: URL.ycp 36213 2007-02-16 12:02:08Z lslezak $
+ * $Id: URL.ycp 36762 2007-03-07 12:27:35Z jsrain $
*/
{
@@ -46,6 +46,11 @@
TEST(``(test()), [], nil);
+TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"path/to/dir"])), [], nil);
+TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"/path/to/dir"])), [], nil);
+TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"//path/to/dir"])), [], nil);
+TEST(``(URL::Build($["scheme":"ftp","host":"ftp.example.com","path":"///path/to/dir"])), [], nil);
+
string long_url = "http://download.opensuse.org/very/log/path/which/will/be/truncated/target_fi...";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.16/VERSION new/yast2-2.15.17/VERSION
--- old/yast2-2.15.16/VERSION 2007-03-05 10:47:47.000000000 +0100
+++ new/yast2-2.15.17/VERSION 2007-03-08 18:22:00.000000000 +0100
@@ -1 +1 @@
-2.15.16
+2.15.17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org