Hello community,
here is the log from the commit of package yast2-packager
checked in at Wed Nov 8 14:03:48 CET 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-11-06 18:14:52.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2006-11-08 13:29:23.000000000 +0100
@@ -1,0 +2,9 @@
+Wed Nov 8 12:54:46 CET 2006 - lslezak@suse.cz
+
+- installation source: split directory name from host name
+ (#211522), refresh "User" and "Password" widget status when
+ scheme is changed
+- callbacks: return correct ignore value in the command line mode
+- 2.14.3
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.14.2.tar.bz2
New:
----
yast2-packager-2.14.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.40TaBh/_old 2006-11-08 14:02:26.000000000 +0100
+++ /var/tmp/diff_new_pack.40TaBh/_new 2006-11-08 14:02:26.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.14.2)
+# spec file for package yast2-packager (Version 2.14.3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-packager
-Version: 2.14.2
+Version: 2.14.3
Release: 1
License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.14.2.tar.bz2
+Source0: yast2-packager-2.14.3.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
Requires: checkmedia yast2-country
@@ -46,7 +46,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.14.2
+%setup -n yast2-packager-2.14.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +84,12 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Wed Nov 08 2006 - lslezak@suse.cz
+- installation source: split directory name from host name
+ (#211522), refresh "User" and "Password" widget status when
+ scheme is changed
+- callbacks: return correct ignore value in the command line mode
+- 2.14.3
* Mon Nov 06 2006 - lslezak@suse.cz
- fixed the default button in the SLP source selection dialog
(#214924)
++++++ yast2-packager-2.14.2.tar.bz2 -> yast2-packager-2.14.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.14.2/VERSION new/yast2-packager-2.14.3/VERSION
--- old/yast2-packager-2.14.2/VERSION 2006-11-06 17:56:34.000000000 +0100
+++ new/yast2-packager-2.14.3/VERSION 2006-11-08 12:40:17.000000000 +0100
@@ -1 +1 @@
-2.14.2
+2.14.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.14.2/configure new/yast2-packager-2.14.3/configure
--- old/yast2-packager-2.14.2/configure 2006-11-06 18:02:11.000000000 +0100
+++ new/yast2-packager-2.14.3/configure 2006-11-08 13:22:55.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-packager 2.14.2.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.14.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.14.2'
-PACKAGE_STRING='yast2-packager 2.14.2'
+PACKAGE_VERSION='2.14.3'
+PACKAGE_STRING='yast2-packager 2.14.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1180,7 +1180,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-packager 2.14.2 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.14.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1251,7 +1251,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.14.2:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.14.3:";;
esac
cat <<\_ACEOF
@@ -1329,7 +1329,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.14.2
+yast2-packager configure 2.14.3
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1343,7 +1343,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-packager $as_me 2.14.2, which was
+It was created by yast2-packager $as_me 2.14.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2144,7 +2144,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.14.2'
+ VERSION='2.14.3'
cat >>confdefs.h <<_ACEOF
@@ -2371,7 +2371,7 @@
-VERSION="2.14.2"
+VERSION="2.14.3"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3229,7 +3229,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.14.2, which was
+This file was extended by yast2-packager $as_me 2.14.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3272,7 +3272,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.14.2
+yast2-packager config.status 2.14.3
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-packager-2.14.2/configure.in new/yast2-packager-2.14.3/configure.in
--- old/yast2-packager-2.14.2/configure.in 2006-11-06 18:02:05.000000000 +0100
+++ new/yast2-packager-2.14.3/configure.in 2006-11-08 13:22:50.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.14.2, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.14.3, http://bugs.opensuse.org/, yast2-packager)
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.14.2"
+VERSION="2.14.3"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.14.2/src/modules/PackageCallbacks.ycp new/yast2-packager-2.14.3/src/modules/PackageCallbacks.ycp
--- old/yast2-packager-2.14.2/src/modules/PackageCallbacks.ycp 2006-11-01 14:56:19.000000000 +0100
+++ new/yast2-packager-2.14.3/src/modules/PackageCallbacks.ycp 2006-11-08 12:53:53.000000000 +0100
@@ -220,10 +220,10 @@
}
// otherwise return Ignore (default)
- return "";
+ return "I";
}
- return "";
+ return "I";
}
term button_box = `HBox (`PushButton (`id(`abort), Label::AbortButton()));
@@ -276,7 +276,7 @@
y2error("Unknown user input: %1", r);
}
- return "";
+ return "I";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.14.2/src/modules/SourceDialogs.ycp new/yast2-packager-2.14.3/src/modules/SourceDialogs.ycp
--- old/yast2-packager-2.14.2/src/modules/SourceDialogs.ycp 2006-10-13 11:05:29.000000000 +0200
+++ new/yast2-packager-2.14.3/src/modules/SourceDialogs.ycp 2006-11-08 13:05:26.000000000 +0100
@@ -429,6 +429,7 @@
* @return always nil
*/
symbol ServerHandle (string key, map event) {
+ y2debug("ServerHandle: %1, %2", key, event);
any id = event["ID"]:nil;
if (is (id, symbol)
&& contains ([`http, `https, `ftp, `samba, `rb_type], (symbol)id))
@@ -488,14 +489,21 @@
)
);
UI::ReplaceWidget (`id (`server_rp), widget);
+
+ // update widget status
+ UI::ChangeWidget (`id (`username), `Enabled, !anonymous);
+ UI::ChangeWidget (`id (`password), `Enabled, !anonymous);
+ if (UI::WidgetExists (`id (`workgroup)))
+ UI::ChangeWidget (`id (`workgroup), `Enabled, !anonymous);
+
return nil;
}
if (event["ID"]:nil == `anonymous)
{
boolean anonymous = (boolean)UI::QueryWidget (`id (`anonymous),
`Value);
- UI::ChangeWidget (`id (`username), `Enabled, false);
- UI::ChangeWidget (`id (`password), `Enabled, false);
+ UI::ChangeWidget (`id (`username), `Enabled, !anonymous);
+ UI::ChangeWidget (`id (`password), `Enabled, !anonymous);
if (UI::WidgetExists (`id (`workgroup)))
UI::ChangeWidget (`id (`workgroup), `Enabled, !anonymous);
return nil;
@@ -588,6 +596,8 @@
* @param event map which caused settings being stored
*/
void ServerStore (string key, map event) {
+ y2debug("Server store: %1, %2", key, event);
+
symbol type = (symbol) UI::QueryWidget( `id( `rb_type), `CurrentButton );
map parsed = $[];
if ( type == `ftp )
@@ -608,9 +618,32 @@
if (size (pass) != 0)
parsed["pass"] = pass;
}
- parsed["host"] = NormalizeHost (
- (string)UI::QueryWidget (`id (`server), `Value));
+
+ string host = NormalizeHost((string)UI::QueryWidget (`id (`server), `Value));
string directory = (string)UI::QueryWidget (`id (`dir), `Value);
+
+ // is / in the host name?
+ integer pos = findfirstof(host, "/");
+ if (pos != nil)
+ {
+ // update the hostname and the directory,
+ // URL::Build return empty URL when the hostname is not valid
+ y2milestone("The hostname contains a path: %1", host);
+ string dir = substring(host, pos);
+
+ if (substring(dir, size(dir) - 1, 1) != "/" && substring(directory, 0, 1) != "/")
+ {
+ dir = dir + "/";
+ }
+
+ directory = dir + directory;
+ host = substring(host, 0, pos);
+
+ y2milestone("Updated hostname: %1, directory: %2", host, directory);
+ }
+
+ parsed["host"] = host;
+
if (type == `samba)
{
string share = (string)UI::QueryWidget (`id (`share), `Value);
@@ -628,7 +661,9 @@
directory = directory + ";workgroup=" + workgroup;
}
parsed["path"] = directory;
+ y2milestone("Entered URL: %1", parsed);
_url = URL::Build (parsed);
+ y2milestone("URL::Build: %1", _url);
if (UI::WidgetExists (`id (`ch_iso)))
{
boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.14.2/test.pot new/yast2-packager-2.14.3/test.pot
--- old/yast2-packager-2.14.2/test.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.14.3/test.pot 2006-11-08 10:20:30.000000000 +0100
@@ -0,0 +1,37 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-08 10:20+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. help text
+#: src/modules/test.ycp:30
+msgid "Start installation in a virtual machine"
+msgstr ""
+
+#. command description
+#: src/modules/test.ycp:38
+msgid "Start installation"
+msgstr ""
+
+#. option description
+#: src/modules/test.ycp:45
+msgid "List only configured devices"
+msgstr ""
+
+#. option description
+#: src/modules/test.ycp:49
+msgid "List all detected IDE devices"
+msgstr ""
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org