Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri Sep 12 17:29:30 CEST 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-09-10 16:00:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-09-12 15:12:08.887869000 +0200
@@ -1,0 +2,7 @@
+Fri Sep 12 14:56:19 CEST 2008 - lslezak@suse.cz
+
+- sw_single - handle 'Configuration->Online Update' menu item
+ (fate#303458)
+- 2.17.15
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.17.14.tar.bz2
New:
----
yast2-packager-2.17.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.Z20910/_old 2008-09-12 17:28:48.000000000 +0200
+++ /var/tmp/diff_new_pack.Z20910/_new 2008-09-12 17:28:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.17.14)
+# spec file for package yast2-packager (Version 2.17.15)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-packager
-Version: 2.17.14
+Version: 2.17.15
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.17.14.tar.bz2
+Source0: yast2-packager-2.17.15.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
# HTTP.ycp
@@ -78,7 +78,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.17.14
+%setup -n yast2-packager-2.17.15
%build
%{prefix}/bin/y2tool y2autoconf
@@ -113,8 +113,11 @@
/usr/share/YaST2/scrconf/*
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
-
%changelog
+* Fri Sep 12 2008 lslezak@suse.cz
+- sw_single - handle 'Configuration->Online Update' menu item
+ (fate#303458)
+- 2.17.15
* Wed Sep 10 2008 locilka@suse.cz
- Desktop selection dialog definitions have been moved to control
file (bnc #424678).
++++++ yast2-packager-2.17.14.tar.bz2 -> yast2-packager-2.17.15.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.14/configure new/yast2-packager-2.17.15/configure
--- old/yast2-packager-2.17.14/configure 2008-09-10 16:01:29.000000000 +0200
+++ new/yast2-packager-2.17.15/configure 2008-09-12 15:09:15.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-packager 2.17.14.
+# Generated by GNU Autoconf 2.61 for yast2-packager 2.17.15.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.17.14'
-PACKAGE_STRING='yast2-packager 2.17.14'
+PACKAGE_VERSION='2.17.15'
+PACKAGE_STRING='yast2-packager 2.17.15'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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.17.14 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.17.15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.17.14:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.17.15:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.17.14
+yast2-packager configure 2.17.15
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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.17.14, which was
+It was created by yast2-packager $as_me 2.17.15, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.17.14'
+ VERSION='2.17.15'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.14"
+VERSION="2.17.15"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3304,7 +3304,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.17.14, which was
+This file was extended by yast2-packager $as_me 2.17.15, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.17.14
+yast2-packager config.status 2.17.15
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.14/configure.in new/yast2-packager-2.17.15/configure.in
--- old/yast2-packager-2.17.14/configure.in 2008-09-10 16:01:26.000000000 +0200
+++ new/yast2-packager-2.17.15/configure.in 2008-09-12 15:09:10.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.17.14, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.17.15, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.14"
+VERSION="2.17.15"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.14/packager.pot new/yast2-packager-2.17.15/packager.pot
--- old/yast2-packager-2.17.14/packager.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.17.15/packager.pot 2008-09-10 10:47:12.000000000 +0200
@@ -0,0 +1,99 @@
+# translation of packager.po to
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Andrew Spackman , 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: packager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-08-04 13:54+0200\n"
+"PO-Revision-Date: 2008-08-27 21:38+1200\n"
+"Last-Translator: Andrew Spackman \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: src/clients/inst_packages.ycp:76
+msgid ""
+"<p>\n"
+"\t\t This dialog allows you to define this system's tasks and what software to install.\n"
+"\t\t Available tasks and software for this system are shown by category in the left\n"
+"\t\t column. To view a description for an item, select it in the list.\n"
+"\t\t </p>"
+msgstr ""
+"<p>\n"
+"\t\t This dialog allows you to define this system's tasks and the software that has to be installed.\n"
+"\t\t Available tasks and software for this system are shown by category in the left\n"
+"\t\t column. To view a description for an item, select it in the list.\n"
+"\t\t </p>"
+
+#. TRANSLATORS: dialog help
+#: src/clients/inst_productsources.ycp:600
+msgid ""
+"<p>Please wait while the packager is being initialized\n"
+"and the list of servers dowloaded from Web.</p>\n"
+msgstr ""
+"<p>Please wait while the packager is being initialized\n"
+"and the list of servers downloaded from the Web.</p>\n"
+
+#. help, continued
+#: src/clients/repositories.ycp:486
+msgid ""
+"<p>\n"
+"<b>Synchronize Changes with ZENworks</b> will call <tt>rug</tt>\n"
+"to also perform the changes in that package management system.</p>\n"
+msgstr ""
+"<p>\n"
+"<b>Synchronize Changes with ZENworks</b> will also call <tt>rug</tt>\n"
+"to perform the changes in that package management system.</p>\n"
+
+#: src/clients/webpin_package_search.ycp:223
+msgid ""
+"<p><big><b>Security</b></big><br>\n"
+"The software found is often not part of the distribution itself and the level of trust\n"
+"depends on yourself. We do not take any responsibilities for installing\n"
+"such software.</p>"
+msgstr ""
+"<p><big><b>Security</b></big><br>\n"
+"The software found is often not part of the distribution itself and the level of trust\n"
+"depends on yourself. We do not take any responsibility for installing\n"
+"such software.</p>"
+
+#. help text - media check 2/8
+#: src/include/checkmedia/ui.ycp:279
+msgid ""
+"<P>When you have a problem with\n"
+"the installation and are using a CD or DVD installation medium, you should check\n"
+"whether the medium is broken.</P>\n"
+msgstr ""
+"<P>When you have a problem with\n"
+"the installation and you are using a CD or DVD installation medium, you should check\n"
+"whether the medium is broken.</P>\n"
+
+#: src/include/checkmedia/ui.ycp:432
+msgid ""
+"The medium does not contain MD5 checksum.\n"
+"The content of the medium cannot be verified.\n"
+"\n"
+"Only readability of the medium will be checked."
+msgstr ""
+"The medium does not contain a MD5 checksum.\n"
+"The content of the medium cannot be verified.\n"
+"\n"
+"Only readability of the medium will be checked."
+
+#. (see bnc#178357 why these numbers)
+#. translators: help text for software proposal
+#: src/modules/Packages.ycp:302
+msgid "<P>The propsal contains total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slighltly larger than the proposed value. Therefore it is a good idea to have at least 25% (or 300MB) free space before starting the installation.</P>"
+msgstr "<P>The propsal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slighltly larger than the proposed value. Therefore it is a good idea to have at least 25% (or 300MB) free space before starting the installation.</P>"
+
+#. help text for software proposal
+#: src/modules/Packages.ycp:304
+msgid "<P>The total size to download is size of packages which will be downloaded from remote (network) repositories. This value is important when the connection is slow or when there is a data limit for downloading.</P>"
+msgstr ""
+"<P>The total 'size to download' is the size of the packages which will be downloaded from remote (network) repositories.\n"
+" This value is important when the connection is slow or when there is a data limit for downloading.</P>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.14/src/clients/repositories.ycp new/yast2-packager-2.17.15/src/clients/repositories.ycp
--- old/yast2-packager-2.17.14/src/clients/repositories.ycp 2008-09-10 15:52:37.000000000 +0200
+++ new/yast2-packager-2.17.15/src/clients/repositories.ycp 2008-09-11 08:49:04.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose:
* Adding, removing and prioritizing of repositories for packagemanager.
*
- * $Id: repositories.ycp 50956 2008-09-10 13:33:29Z lslezak $
+ * $Id: repositories.ycp 51008 2008-09-11 06:49:04Z lslezak $
*
*/
@@ -246,8 +246,9 @@
`VSquash(`RichText(`id(`repo_info), ""));
}
- void fillRepoInfo(integer index, map source) {
- map info = getSourceInfo (index, source);
+ void fillRepoInfo(integer index, map source, boolean repo_mode, string service_name)
+ {
+ map info = repo_mode ? getSourceInfo (index, source) : source;
y2internal("getSourceInfo(%1, %2): %3", index, source, info);
// heading - in case repo name not found
@@ -267,6 +268,12 @@
sformat (_("Service: %1"), service);
}
+ // don't display category for services
+ if (!repo_mode)
+ {
+ category = "";
+ }
+
if (textmode())
{
UI::ChangeWidget(`id(`name), `Label, name);
@@ -289,15 +296,9 @@
if (selected == nil)
return;
- if (repository_view)
- {
- map data = sourceStatesOut[selected]:$[];
- fillRepoInfo (selected, data);
- }
- else
- {
- y2internal("TODO display service info");
- }
+ map data = (repository_view) ? sourceStatesOut[selected]:$[] : serviceStatesOut[selected]:$[];
+
+ fillRepoInfo (selected, data, repository_view, displayed_service);
}
/**
@@ -608,6 +609,9 @@
fillTable(repository_view, displayed_service);
fillCurrentRepoInfo();
+ // set the current view to repositories
+ UI::ChangeWidget(`id(`tree), `CurrentItem, `repositories);
+
symbol input = nil;
integer current = -1;
@@ -883,27 +887,50 @@
}
else if ( input == `autorefresh)
{
- integer source_id = sourceState["SrcId"]:0;
- map src_data = Pkg::SourceGeneralData (source_id);
- string type = src_data["type"]:"UnitedLinux";
- boolean state = sourceState[ "autorefresh" ]:true;
-
- if (type == "PlainDir" && ! state)
+ if (repository_view)
{
- // popup message
- Popup::Message (_("For the selected repository, refresh
-cannot be set."));
+ integer source_id = sourceState["SrcId"]:0;
+ map src_data = Pkg::SourceGeneralData (source_id);
+ string type = src_data["type"]:"UnitedLinux";
+ boolean state = sourceState[ "autorefresh" ]:true;
+
+ if (type == "PlainDir" && ! state)
+ {
+ // popup message
+ Popup::Message (_("For the selected repository, refresh
+ cannot be set."));
+ }
+ else
+ {
+ state = !state;
+
+ string newstate = (state ? UI::Glyph(`CheckMark) : "");
+ UI::ChangeWidget(`id(`table), `Item(current, 2), newstate);
+ }
+
+ sourceState["autorefresh"] = state;
+ sourceStatesOut[ current ] = sourceState;
}
else
{
- state = !state;
+ if (displayed_service == "")
+ {
+ map srv = serviceStatesOut[current]:$[];
+ y2internal("Selected service: %1", srv);
- string newstate = (state ? UI::Glyph(`CheckMark) : "");
- UI::ChangeWidget(`id(`table), `Item(current, 2), newstate);
- }
+ boolean state = srv["autorefresh"]:false;
+ state = !state;
- sourceState["autorefresh"] = state;
- sourceStatesOut[ current ] = sourceState;
+ // update the table
+ string newstate = ( state ? UI::Glyph (`CheckMark) : "");
+ UI::ChangeWidget( `id( `table ), `Item( current, 1 ), newstate );
+
+ // store the change
+ srv["autorefresh"] = state;
+ serviceStatesOut[current] = srv;
+ }
+ // TODO else...
+ }
// do not refresh the item in the table
current = -1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.14/src/clients/sw_single.ycp new/yast2-packager-2.17.15/src/clients/sw_single.ycp
--- old/yast2-packager-2.17.14/src/clients/sw_single.ycp 2008-09-05 10:19:29.000000000 +0200
+++ new/yast2-packager-2.17.15/src/clients/sw_single.ycp 2008-09-12 15:09:06.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 50663 2008-09-04 12:27:36Z lslezak $
+ * $Id: sw_single.ycp 51115 2008-09-12 13:09:05Z lslezak $
*
* Note: sw_single accepts a map parameter: $[ "dialog_type" : symbol,
* "repo_mgmt" : boolean ]
@@ -448,6 +448,15 @@
force_restart = true;
}
}
+ else if (result == `online_update_configuration)
+ {
+ symbol online_result = (symbol)WFM::CallFunction( "online_update_configuration", []);
+
+ if (online_result != `abort)
+ {
+ force_restart = true;
+ }
+ }
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.14/VERSION new/yast2-packager-2.17.15/VERSION
--- old/yast2-packager-2.17.14/VERSION 2008-09-10 16:00:40.000000000 +0200
+++ new/yast2-packager-2.17.15/VERSION 2008-09-12 14:56:11.000000000 +0200
@@ -1 +1 @@
-2.17.14
+2.17.15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org