Hello community,
here is the log from the commit of package yast2-packager
checked in at Mon Feb 19 23:27:50 CET 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-02-16 13:26:24.000000000 +0100
+++ yast2-packager/yast2-packager.changes 2007-02-19 16:45:41.348631000 +0100
@@ -1,0 +2,27 @@
+Mon Feb 19 14:10:31 CET 2007 - lslezak@suse.cz
+
+- added Browse buttons for scanning the network in NFS source
+ dialog, use Label::BrowseButton()
+- fixed errors reported by check_ycp
+- 2.15.15
+
+-------------------------------------------------------------------
+Mon Feb 19 13:54:28 CET 2007 - locilka@suse.cz
+
+- Do not call bind mount and do not remove devs.rpm when running
+ the System Update. Only remove from rpm database in that case
+ (#246389).
+
+-------------------------------------------------------------------
+Mon Feb 19 10:22:47 CET 2007 - lslezak@suse.cz
+
+- do not show "install more" question when the package selection
+ has been aborted or the package selection has not been changed
+ (#230773)
+- installation source - renamed menu item ("Enable or Disable" ->
+ "Status On or Off") to be consistent with the table header
+ (#231225)
+- do not display "CD x" medium description in the media change
+ popup if the source is a network source (#156028)
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.14.tar.bz2
New:
----
yast2-packager-2.15.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.eq7060/_old 2007-02-19 23:27:34.000000000 +0100
+++ /var/tmp/diff_new_pack.eq7060/_new 2007-02-19 23:27:34.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.14)
+# spec file for package yast2-packager (Version 2.15.15)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,17 +11,17 @@
# norootforbuild
Name: yast2-packager
-Version: 2.15.14
+Version: 2.15.15
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.14.tar.bz2
+Source0: yast2-packager-2.15.15.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: yast2-country
-# new Pkg::*Locale() functions (#223624)
-Requires: yast2-pkg-bindings >= 2.15.4
+# Pkg::IsAnyResolvable()
+Requires: yast2-pkg-bindings >= 2.15.9
# URL::FormatURL()
Requires: yast2 >= 2.15.10
Provides: yast2-config-package-manager
@@ -45,7 +45,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.15.14
+%setup -n yast2-packager-2.15.15
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,6 +83,24 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Mon Feb 19 2007 - lslezak@suse.cz
+- added Browse buttons for scanning the network in NFS source
+ dialog, use Label::BrowseButton()
+- fixed errors reported by check_ycp
+- 2.15.15
+* Mon Feb 19 2007 - locilka@suse.cz
+- Do not call bind mount and do not remove devs.rpm when running
+ the System Update. Only remove from rpm database in that case
+ (#246389).
+* Mon Feb 19 2007 - lslezak@suse.cz
+- do not show "install more" question when the package selection
+ has been aborted or the package selection has not been changed
+ (#230773)
+- installation source - renamed menu item ("Enable or Disable" ->
+ "Status On or Off") to be consistent with the table header
+ (#231225)
+- do not display "CD x" medium description in the media change
+ popup if the source is a network source (#156028)
* Fri Feb 16 2007 - lslezak@suse.cz
- Replace the middle part of a long URL/file name by ellipsis
to display the most interesting part of the message in
++++++ yast2-packager-2.15.14.tar.bz2 -> yast2-packager-2.15.15.tar.bz2 ++++++
++++ 3309 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-packager-2.15.14/VERSION new/yast2-packager-2.15.15/VERSION
--- old/yast2-packager-2.15.14/VERSION 2007-02-16 13:13:50.000000000 +0100
+++ new/yast2-packager-2.15.15/VERSION 2007-02-19 16:41:24.000000000 +0100
@@ -1 +1 @@
-2.15.14
+2.15.15
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-packager-2.15.14/configure.in new/yast2-packager-2.15.15/configure.in
--- old/yast2-packager-2.15.14/configure.in 2007-02-16 13:19:56.000000000 +0100
+++ new/yast2-packager-2.15.15/configure.in 2007-02-19 16:44:20.000000000 +0100
@@ -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-packager, 2.15.14, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.15, 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.15.14"
+VERSION="2.15.15"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
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-packager-2.15.14/src/clients/dirinstall.ycp new/yast2-packager-2.15.15/src/clients/dirinstall.ycp
--- old/yast2-packager-2.15.14/src/clients/dirinstall.ycp 2007-02-02 16:23:42.000000000 +0100
+++ new/yast2-packager-2.15.15/src/clients/dirinstall.ycp 2007-02-19 15:04:22.000000000 +0100
@@ -4,6 +4,8 @@
* Summary: Installation into a directory
* Authors: Anas Nashif
*
+ * $Id: dirinstall.ycp 36265 2007-02-19 14:04:18Z lslezak $
+ *
*/
{
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-packager-2.15.14/src/clients/dirinstall_options_proposal.ycp new/yast2-packager-2.15.15/src/clients/dirinstall_options_proposal.ycp
--- old/yast2-packager-2.15.14/src/clients/dirinstall_options_proposal.ycp 2007-02-01 14:03:01.000000000 +0100
+++ new/yast2-packager-2.15.15/src/clients/dirinstall_options_proposal.ycp 2007-02-19 15:04:22.000000000 +0100
@@ -4,6 +4,9 @@
* Author: Anas Nashif
*
* Purpose: Proposal for dirinstall options
+ *
+ * $Id: dirinstall_options_proposal.ycp 36265 2007-02-19 14:04:18Z lslezak $
+ *
*/
{
textdomain "packager";
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-packager-2.15.14/src/clients/inst_custom_packages.ycp new/yast2-packager-2.15.15/src/clients/inst_custom_packages.ycp
--- old/yast2-packager-2.15.14/src/clients/inst_custom_packages.ycp 2005-10-11 08:41:20.000000000 +0200
+++ new/yast2-packager-2.15.15/src/clients/inst_custom_packages.ycp 2007-02-19 14:33:31.000000000 +0100
@@ -5,6 +5,8 @@
*
* Purpose: Client for 3rd prodcuts/addon products package installations
*
+ * $Id:$
+ *
*/
{
textdomain "packager";
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-packager-2.15.14/src/clients/inst_kickoff.ycp new/yast2-packager-2.15.15/src/clients/inst_kickoff.ycp
--- old/yast2-packager-2.15.14/src/clients/inst_kickoff.ycp 2007-02-15 07:38:21.000000000 +0100
+++ new/yast2-packager-2.15.15/src/clients/inst_kickoff.ycp 2007-02-19 15:55:54.000000000 +0100
@@ -5,6 +5,8 @@
*
* Purpose: Do various tasks before starting with installation of rpms.
*
+ * $Id: inst_kickoff.ycp 36269 2007-02-19 14:25:33Z locilka $
+ *
*/
{
@@ -337,17 +339,26 @@
// Feature #301903, bugzilla #244937
if (Mode::update()) {
- // When upgrading system, remove devs.rpm if installed
- LocalCommand (sformat (
- "/bin/rpm --root '%1' -q 'devs' && /bin/rpm --nodeps --root '%1' -e 'devs'",
- String::Quote (Installation::destdir)
- ));
-
- // Mount (bind) the current /dev/ to the /installed_system/dev/
- LocalCommand (sformat (
- "/bin/rm -rf '%1/dev/' && /bin/mkdir -p '%1/dev/' && /bin/mount -v --bind '/dev/' '%1/dev/'",
- String::Quote (Installation::destdir)
- ));
+ // "/" means updating the running system, bugzilla #246389
+ if (Installation::destdir == "/") {
+ // When upgrading system, remove devs.rpm just from rpm database
+ LocalCommand (
+ "/bin/rpm -q 'devs' && /bin/rpm --nodeps --justdb -e 'devs'"
+ );
+ // normal upgrade
+ } else {
+ // When upgrading system, remove devs.rpm if installed
+ LocalCommand (sformat (
+ "/bin/rpm --root '%1' -q 'devs' && /bin/rpm --nodeps --root '%1' -e 'devs'",
+ String::Quote (Installation::destdir)
+ ));
+
+ // Mount (bind) the current /dev/ to the /installed_system/dev/
+ LocalCommand (sformat (
+ "/bin/rm -rf '%1/dev/' && /bin/mkdir -p '%1/dev/' && /bin/mount -v --bind '/dev/' '%1/dev/'",
+ String::Quote (Installation::destdir)
+ ));
+ }
}
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-packager-2.15.14/src/clients/inst_media.ycp new/yast2-packager-2.15.15/src/clients/inst_media.ycp
--- old/yast2-packager-2.15.14/src/clients/inst_media.ycp 2007-01-12 15:39:34.000000000 +0100
+++ new/yast2-packager-2.15.15/src/clients/inst_media.ycp 2007-02-19 15:04:22.000000000 +0100
@@ -4,6 +4,9 @@
* Authors: Arvin Schnell
*
* Purpose: Show some stuff about the installation media.
+ *
+ * $Id: inst_media.ycp 36265 2007-02-19 14:04:18Z lslezak $
+ *
*/
{
textdomain "packager";
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-packager-2.15.14/src/clients/inst_mediacopy.ycp new/yast2-packager-2.15.15/src/clients/inst_mediacopy.ycp
--- old/yast2-packager-2.15.14/src/clients/inst_mediacopy.ycp 2006-03-10 16:38:54.000000000 +0100
+++ new/yast2-packager-2.15.15/src/clients/inst_mediacopy.ycp 2007-02-19 15:04:22.000000000 +0100
@@ -4,6 +4,9 @@
* Authors: Anas Nashif
*
* Purpose: Copy Media to local disk
+ *
+ * $Id: inst_mediacopy.ycp 36265 2007-02-19 14:04:18Z lslezak $
+ *
*/
{
textdomain "packager";
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-packager-2.15.14/src/clients/inst_packages.ycp new/yast2-packager-2.15.15/src/clients/inst_packages.ycp
--- old/yast2-packager-2.15.14/src/clients/inst_packages.ycp 2007-02-09 14:12:35.000000000 +0100
+++ new/yast2-packager-2.15.15/src/clients/inst_packages.ycp 2007-02-19 15:04:22.000000000 +0100
@@ -2,6 +2,9 @@
* Module: inst_packages.ycp
* Authors: Stefan Hundhammer
* Purpose: Show the package installation dialog
+ *
+ * $Id: inst_packages.ycp 36265 2007-02-19 14:04:18Z lslezak $
+ *
*/
{
@@ -26,7 +29,7 @@
UI::OpenDialog(`opt(`defaultsize),
`ReplacePoint(`id( `rep),
- `Label( "Reading package database..." )
+ `Label( _("Reading package database...") )
)
);
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-packager-2.15.14/src/clients/inst_source.ycp new/yast2-packager-2.15.15/src/clients/inst_source.ycp
--- old/yast2-packager-2.15.14/src/clients/inst_source.ycp 2007-02-16 09:24:57.000000000 +0100
+++ new/yast2-packager-2.15.15/src/clients/inst_source.ycp 2007-02-19 15:04:22.000000000 +0100
@@ -6,6 +6,8 @@
* Purpose:
* Adding, removing and prioritizing of installation sources for packagemanager.
*
+ * $Id: inst_source.ycp 36265 2007-02-19 14:04:18Z lslezak $
+ *
*/
{
@@ -303,7 +305,7 @@
// pusg button
string refreshButtonLabel = _("Re&fresh Now...");
// pusg button
- string enableButtonLabel = _("Enab&le or Disable");
+ string enableButtonLabel = _("Status &On or Off");
// push button
string refreshOnOffButtonLabel = _("Refre&sh On or Off");
@@ -402,7 +404,7 @@
To change a catalog media, use <b>Edit</b>. To remove a catalog, use
<b>Delete</b>. To enable or disable the catalog, set refreshing on the
initialization time on or off, or refresh it immediatelly, use
-<b>Source Settings</b>.");
+<b>Source Settings</b>.</p>");
// help, continued
help_text = help_text + _("<p>
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-packager-2.15.14/src/clients/inst_sw_select.ycp new/yast2-packager-2.15.15/src/clients/inst_sw_select.ycp
--- old/yast2-packager-2.15.14/src/clients/inst_sw_select.ycp 2006-04-18 14:52:00.000000000 +0200
+++ new/yast2-packager-2.15.15/src/clients/inst_sw_select.ycp 2007-02-19 15:04:22.000000000 +0100
@@ -11,6 +11,9 @@
* Packages module read:
*
* Packages module write:
+ *
+ * $Id: inst_sw_select.ycp 36265 2007-02-19 14:04:18Z lslezak $
+ *
*/
{
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-packager-2.15.14/src/clients/media_proposal.ycp new/yast2-packager-2.15.15/src/clients/media_proposal.ycp
--- old/yast2-packager-2.15.14/src/clients/media_proposal.ycp 2007-01-12 15:27:20.000000000 +0100
+++ new/yast2-packager-2.15.15/src/clients/media_proposal.ycp 2007-02-19 15:04:22.000000000 +0100
@@ -4,6 +4,9 @@
* Author: Arvin Schnell
*
* Purpose: Initialize the installation media.
+ *
+ * $Id: media_proposal.ycp 36265 2007-02-19 14:04:18Z lslezak $
+ *
*/
{
textdomain "packager";
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-packager-2.15.14/src/clients/software_proposal.ycp new/yast2-packager-2.15.15/src/clients/software_proposal.ycp
--- old/yast2-packager-2.15.14/src/clients/software_proposal.ycp 2007-02-09 13:02:58.000000000 +0100
+++ new/yast2-packager-2.15.15/src/clients/software_proposal.ycp 2007-02-19 15:04:22.000000000 +0100
@@ -6,6 +6,9 @@
* Purpose: Proposal function dispatcher - software.
*
* See also file proposal-API.txt for details.
+ *
+ * $Id: software_proposal.ycp 36265 2007-02-19 14:04:18Z lslezak $
+ *
*/
{
textdomain "packager";
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-packager-2.15.14/src/clients/software_simple_proposal.ycp new/yast2-packager-2.15.15/src/clients/software_simple_proposal.ycp
--- old/yast2-packager-2.15.14/src/clients/software_simple_proposal.ycp 2006-10-13 11:05:27.000000000 +0200
+++ new/yast2-packager-2.15.15/src/clients/software_simple_proposal.ycp 2007-02-19 14:32:37.000000000 +0100
@@ -6,6 +6,9 @@
* Purpose: Proposal function dispatcher - software.
*
* See also file proposal-API.txt for details.
+ *
+ * $Id:$
+ *
*/
{
textdomain "packager";
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-packager-2.15.14/src/clients/sw_single.ycp new/yast2-packager-2.15.15/src/clients/sw_single.ycp
--- old/yast2-packager-2.15.14/src/clients/sw_single.ycp 2007-01-26 10:36:11.000000000 +0100
+++ new/yast2-packager-2.15.15/src/clients/sw_single.ycp 2007-02-19 10:32:06.000000000 +0100
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 35648 2007-01-26 09:36:08Z lslezak $
+ * $Id: sw_single.ycp 36248 2007-02-19 09:32:04Z lslezak $
*/
{
@@ -328,7 +328,14 @@
if (result == `accept)
{
result = `next;
- ask = true;
+ // ask only when there is something to install/remove
+ ask = Pkg::IsAnyResolvable(`any, `to_install) || Pkg::IsAnyResolvable(`any, `to_remove);
+ y2milestone("Ask to restart the package selector: %1", ask);
+ }
+ else
+ {
+ // canceled - don't ask again
+ ask = false;
}
}
else
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-packager-2.15.14/src/include/dirinstall/ui.ycp new/yast2-packager-2.15.15/src/include/dirinstall/ui.ycp
--- old/yast2-packager-2.15.14/src/include/dirinstall/ui.ycp 2007-02-02 16:23:42.000000000 +0100
+++ new/yast2-packager-2.15.15/src/include/dirinstall/ui.ycp 2007-02-19 14:36:00.000000000 +0100
@@ -4,6 +4,8 @@
* Summary: Installation into a directory
* Authors: Anas Nashif
*
+ * $Id:$
+ *
*/
{
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-packager-2.15.14/src/include/storage_include.ycp new/yast2-packager-2.15.15/src/include/storage_include.ycp
--- old/yast2-packager-2.15.14/src/include/storage_include.ycp 2007-02-09 13:09:31.000000000 +0100
+++ new/yast2-packager-2.15.15/src/include/storage_include.ycp 2007-02-19 14:34:59.000000000 +0100
@@ -4,6 +4,8 @@
* Summary: Storage calls
* Authors: Lukas Ocilka
*
+ * $Id:$
+ *
*/
{
textdomain "installation";
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-packager-2.15.14/src/modules/PackageCallbacks.ycp new/yast2-packager-2.15.15/src/modules/PackageCallbacks.ycp
--- old/yast2-packager-2.15.14/src/modules/PackageCallbacks.ycp 2007-02-16 10:34:13.000000000 +0100
+++ new/yast2-packager-2.15.15/src/modules/PackageCallbacks.ycp 2007-02-19 16:43:46.000000000 +0100
@@ -7,6 +7,8 @@
*
* Purpose: provides the default Callbacks for Pkg::
*
+ * $Id: PackageCallbacks.ycp 36278 2007-02-19 15:43:42Z lslezak $
+ *
*/
{
@@ -566,36 +568,42 @@
if (wanted_label == "")
{
- // will be used in conjunction with other text below
- // prompt for user to insert the correct CD/DVD
- string medianame = "CD "; // FIXME?
- if (url_scheme == "cd")
+ // use only product name for network sources,
+ // there is no medium 1, 2, ...
+ if (url_scheme != "cd" && url_scheme != "dvd")
{
- medianame = "CD ";
+ wanted_label = product;
}
- if (url_scheme == "dvd")
+ else
{
- medianame = "DVD ";
- }
+ // will be used in conjunction with other text below
+ // prompt for user to insert the correct CD/DVD
+ string medianame = "DVD ";
- string mediaside = sformat ("%1", (medianame + wanted));
+ if (url_scheme == "cd")
+ {
+ medianame = "CD ";
+ }
- if (double_sided)
- {
- // media is double sided, we want the user to insert the 'Side A' of the media
- // the complete string will be "<product> <media> <number>, <side>"
- // e.g. "'SuSE Linux 9.0' DVD 1, Side A"
- string side = _("Side A");
- if ((wanted & 1) == 0)
+ string mediaside = sformat ("%1", (medianame + wanted));
+
+ if (double_sided)
{
- // media is double sided, we want the user to insert the 'Side B' of the media
- side = _("Side B");
+ // media is double sided, we want the user to insert the 'Side A' of the media
+ // the complete string will be "<product> <media> <number>, <side>"
+ // e.g. "'SuSE Linux 9.0' DVD 1, Side A"
+ string side = _("Side A");
+ if ((wanted & 1) == 0)
+ {
+ // media is double sided, we want the user to insert the 'Side B' of the media
+ side = _("Side B");
+ }
+ wanted = (wanted + 1) >> 1;
+ mediaside = sformat ("%1", (medianame + wanted)) + ", " + side;
}
- wanted = (wanted + 1) >> 1;
- mediaside = sformat ("%1", (medianame + wanted)) + ", " + side;
- }
- wanted_label = sformat ("%1 %2", product, mediaside);
+ wanted_label = sformat ("%1 %2", product, mediaside);
+ }
}
// prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2")
@@ -752,6 +760,7 @@
if (r == `url)
{
+ y2milestone("Redirecting to: %1", url);
return url;
}
@@ -777,23 +786,18 @@
list<string> words = splitstring(msg, " ");
- y2internal("words: %1", words);
+ y2debug("words: %1", words);
words = maplist(string w, words,
{
map parsed = URL::Parse(w);
integer req_size = max_len - (size(msg) - size(w));
- y2internal("parsed: %1", parsed);
-
// is it a valid URL?
if (contains(["ftp", "http", "nfs", "file", "dir", "iso", "smb", "disk"], parsed["scheme"]:""))
{
- y2internal("Found URL: %1", w);
-
-
+ // reformat the URL
w = URL::FormatURL(parsed, max_len);
- y2internal("Converted to: %1", w);
}
// is it a file name?
{
@@ -816,7 +820,7 @@
if (ret != msg)
{
- y2internal("URL conversion: '%1' converted to '%2'", msg, ret);
+ y2milestone("URL conversion: '%1' converted to '%2'", msg, ret);
}
return ret;
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-packager-2.15.14/src/modules/PackageInstallation.ycp new/yast2-packager-2.15.15/src/modules/PackageInstallation.ycp
--- old/yast2-packager-2.15.14/src/modules/PackageInstallation.ycp 2007-02-02 17:21:18.000000000 +0100
+++ new/yast2-packager-2.15.15/src/modules/PackageInstallation.ycp 2007-02-19 15:04:22.000000000 +0100
@@ -3,6 +3,8 @@
*
* Authors: Gabriele Strattner
*
+ * $Id: PackageInstallation.ycp 36265 2007-02-19 14:04:18Z lslezak $
+ *
*/
{
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-packager-2.15.14/src/modules/SlideShow.ycp new/yast2-packager-2.15.15/src/modules/SlideShow.ycp
--- old/yast2-packager-2.15.14/src/modules/SlideShow.ycp 2007-02-14 15:11:45.000000000 +0100
+++ new/yast2-packager-2.15.15/src/modules/SlideShow.ycp 2007-02-19 15:04:22.000000000 +0100
@@ -4,6 +4,9 @@
* Purpose: Slide show during package installation
*
* Author: Stefan Hundhammer
+ *
+ * $Id: SlideShow.ycp 36265 2007-02-19 14:04:18Z lslezak $
+ *
*/
{
module "SlideShow";
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-packager-2.15.14/src/modules/SlideShowCallbacks.ycp new/yast2-packager-2.15.15/src/modules/SlideShowCallbacks.ycp
--- old/yast2-packager-2.15.14/src/modules/SlideShowCallbacks.ycp 2007-02-14 15:11:45.000000000 +0100
+++ new/yast2-packager-2.15.15/src/modules/SlideShowCallbacks.ycp 2007-02-19 15:04:22.000000000 +0100
@@ -6,6 +6,8 @@
*
* Purpose: provides the Callbacks for SlideShow
*
+ * $Id: SlideShowCallbacks.ycp 36265 2007-02-19 14:04:18Z lslezak $
+ *
*/
{
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-packager-2.15.14/src/modules/SourceDialogs.ycp new/yast2-packager-2.15.15/src/modules/SourceDialogs.ycp
--- old/yast2-packager-2.15.14/src/modules/SourceDialogs.ycp 2007-01-31 11:24:47.000000000 +0100
+++ new/yast2-packager-2.15.15/src/modules/SourceDialogs.ycp 2007-02-19 14:26:46.000000000 +0100
@@ -25,6 +25,7 @@
import "SourceManager";
import "Message";
import "Report";
+import "NetworkPopup";
// common functions / data
@@ -224,7 +225,7 @@
"validate_function" : PlainURLValidate,
// help text
"help" : _("<p><big><b>Catalog URL</b></big><br>
-Use <b>URL</b> to specify the URL of the catalog.<p>") + multi_cd_help,
+Use <b>URL</b> to specify the URL of the catalog.</p>") + multi_cd_help,
];
}
@@ -264,6 +265,43 @@
}
/**
+ * Handle function of a widget
+ * @param key string widget key
+ * @param event map which caused settings being stored
+ * @return always nil
+ */
+symbol NFSHandle (string key, map event) {
+ y2debug("NFSHandle: key: %1, event: %2", key, event);
+
+ if (event["ID"]:nil == `nfs_browse)
+ {
+ string server = (string)UI::QueryWidget (`id (`server), `Value);
+ // dialog caption
+ string result = NetworkPopup::NFSServer(server);
+
+ if (result != nil)
+ {
+ UI::ChangeWidget (`id (`server), `Value, result);
+ }
+ }
+ else if (event["ID"]:nil == `nfs_exports_browse)
+ {
+ string server = (string)UI::QueryWidget (`id (`server), `Value);
+ string nfs_export = (string)UI::QueryWidget (`id (`dir), `Value);
+ // dialog caption
+ string result = NetworkPopup::NFSExport(server, nfs_export);
+
+ if (result != nil)
+ {
+ UI::ChangeWidget (`id (`dir), `Value, result);
+ }
+ }
+
+ return nil;
+}
+
+
+/**
* Get widget description map
* @return widget description map
*/
@@ -271,19 +309,33 @@
return $[
"widget" : `custom,
"custom_widget" : `VBox (
- // text entry
- `TextEntry (`id (`server), _("&Server Name")),
- // text entry
- `TextEntry (`id (`dir), _("&Path to Directory or ISO Image")),
+ `HBox(
+ // text entry
+ `TextEntry (`id (`server), _("&Server Name")),
+ `VBox(
+ `Label(""),
+ `PushButton(`id(`nfs_browse), Label::BrowseButton())
+ )
+ ),
+ `HBox(
+ // text entry
+ `TextEntry (`id (`dir), _("&Path to Directory or ISO Image")),
+ `VBox(
+ `Label(""),
+ `PushButton(`id(`nfs_exports_browse), Label::BrowseButton())
+ )
+ ),
// checkbox label
- `Left (`CheckBox ( `id (`ch_iso), _("ISO Image")))
+ `Left (`CheckBox ( `id (`ch_iso), _("&ISO Image")))
),
"init" : NFSInit,
"store" : NFSStore,
+ "handle" : NFSHandle,
+ "handle_events" : [ `nfs_browse, `nfs_exports_browse ],
// help text
"help" : _("<p><big><b>NFS Server</b></big><br>
Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>
-to specify the NFS server host name and path on the server.<p>")
+to specify the NFS server host name and path on the server.</p>")
+ multi_cd_help,
];
}
@@ -523,7 +575,7 @@
`VBox (
`Label (""),
// push button
- `PushButton (`id (`browse), _("&Browse..."))
+ `PushButton (`id (`browse), Label::BrowseButton())
)
),
// checkbox label
@@ -559,7 +611,7 @@
`VBox (
`Label (""),
// push button
- `PushButton (`id (`browse), _("&Browse..."))
+ `PushButton (`id (`browse), Label::BrowseButton())
)
)
),
@@ -620,7 +672,7 @@
_("&Path to Directory or ISO Image"), dir),
// checkbox label
- `Left (`CheckBox (`id (`ch_iso), _("ISO Image")))
+ `Left (`CheckBox (`id (`ch_iso), _("ISO &Image")))
)
// text entry
: `TextEntry( `id( `dir ), _("&Directory on Server"), dir),
@@ -634,7 +686,7 @@
type == `samba
// text entry
? `TextEntry (`id (`workgroup),
- _("Workgroup or Domain"))
+ _("&Workgroup or Domain"))
: `Empty (),
// text entry
`TextEntry (`id (`username), _("&User Name"), username),
@@ -854,7 +906,7 @@
Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>
to specify the NFS server host name and path on the server.
To enable authentication, uncheck <b>Anonymous</b> and specify the
-<b>User Name</b> and the <b>Password</b>.<p>
+<b>User Name</b> and the <b>Password</b>.</p>
<p>
For SMB/CIFS source, specify <b>Share</b> name and <b>Path to Directory
or ISO Image</b>.
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-packager-2.15.14/src/modules/SourceManagerSLP.ycp new/yast2-packager-2.15.15/src/modules/SourceManagerSLP.ycp
--- old/yast2-packager-2.15.14/src/modules/SourceManagerSLP.ycp 2007-02-02 16:27:43.000000000 +0100
+++ new/yast2-packager-2.15.15/src/modules/SourceManagerSLP.ycp 2007-02-19 14:29:34.000000000 +0100
@@ -121,11 +121,11 @@
`id (`tree_of_services),
`opt (`notify),
// tree label (tree of available products)
- _("Available Installation Products"),
+ _("Available Installation &Products"),
[]
)
)),
- `PushButton(`id(`details), _("Details...")),
+ `PushButton(`id(`details), _("&Details...")),
`VSpacing (1),
`HBox (
`PushButton (`id (`ok), `opt(`default), Label::SelectButton ()),
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-packager-2.15.14/src/modules/test.ycp new/yast2-packager-2.15.15/src/modules/test.ycp
--- old/yast2-packager-2.15.14/src/modules/test.ycp 2007-02-14 16:46:43.000000000 +0100
+++ new/yast2-packager-2.15.15/src/modules/test.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-{
- import "PackageCallbacks";
-
- PackageCallbacks::ErrorScanDb(1, ";;;;;;;;;;sdfdf sdffd sdfgds sdfghdf dsgfdsf");
-}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org