Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri Mar 31 15:53:53 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-03-29 12:21:45.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-03-30 10:51:47.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Mar 30 10:51:45 CEST 2006 - mvidner@suse.cz
+
+- Don't run the modules if another process has the zypp lock (#160319).
+- 2.13.56
+
+-------------------------------------------------------------------
+Wed Mar 29 18:46:59 CEST 2006 - locilka@suse.cz
+
+- Enhanced texts in SignatureCheckDialogs module
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.55.tar.bz2
New:
----
yast2-packager-2.13.56.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.oKtDoy/_old 2006-03-31 15:53:43.000000000 +0200
+++ /var/tmp/diff_new_pack.oKtDoy/_new 2006-03-31 15:53:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.55)
+# spec file for package yast2-packager (Version 2.13.56)
#
# 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.13.55
+Version: 2.13.56
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.55.tar.bz2
+Source0: yast2-packager-2.13.56.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-installation yast2-testsuite yast2-xml
Requires: yast2 yast2-installation checkmedia yast2-country
@@ -41,7 +41,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.13.55
+%setup -n yast2-packager-2.13.56
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,11 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Thu Mar 30 2006 - mvidner@suse.cz
+- Don't run the modules if another process has the zypp lock (#160319).
+- 2.13.56
+* Wed Mar 29 2006 - locilka@suse.cz
+- Enhanced texts in SignatureCheckDialogs module
* Wed Mar 29 2006 - locilka@suse.cz
- Merged proofread texts for SignatureCheckDialogs
- Adjusted dialogs for SignatureCheckDialogs to show informative
++++++ yast2-packager-2.13.55.tar.bz2 -> yast2-packager-2.13.56.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/VERSION new/yast2-packager-2.13.56/VERSION
--- old/yast2-packager-2.13.55/VERSION 2006-03-29 12:21:19.000000000 +0200
+++ new/yast2-packager-2.13.56/VERSION 2006-03-30 10:50:25.000000000 +0200
@@ -1 +1 @@
-2.13.55
+2.13.56
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/configure new/yast2-packager-2.13.56/configure
--- old/yast2-packager-2.13.55/configure 2006-03-29 14:10:19.000000000 +0200
+++ new/yast2-packager-2.13.56/configure 2006-03-30 11:09:25.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.55.
+# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.56.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.13.55'
-PACKAGE_STRING='yast2-packager 2.13.55'
+PACKAGE_VERSION='2.13.56'
+PACKAGE_STRING='yast2-packager 2.13.56'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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.13.55 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.13.56 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.13.55:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.13.56:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.13.55
+yast2-packager configure 2.13.56
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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.13.55, which was
+It was created by yast2-packager $as_me 2.13.56, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.13.55'
+ VERSION='2.13.56'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.55"
+VERSION="2.13.56"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
@@ -2695,7 +2695,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-packager $as_me 2.13.55, which was
+This file was extended by yast2-packager $as_me 2.13.56, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2750,7 +2750,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.13.55
+yast2-packager config.status 2.13.56
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/configure.in new/yast2-packager-2.13.56/configure.in
--- old/yast2-packager-2.13.55/configure.in 2006-03-29 14:10:14.000000000 +0200
+++ new/yast2-packager-2.13.56/configure.in 2006-03-30 11:09:17.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.55, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.56, http://www.suse.de/feedback, 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.13.55"
+VERSION="2.13.56"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/packager.pot new/yast2-packager-2.13.56/packager.pot
--- old/yast2-packager-2.13.55/packager.pot 2006-03-28 17:38:45.000000000 +0200
+++ new/yast2-packager-2.13.56/packager.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,174 +0,0 @@
-#. popup question, %1 stands for the package name
-#: src/modules/SignatureCheckDialogs.ycp:130
-#, ycp-format
-msgid ""
-"The package '%1' is not digitally signed. This means that the origin\n"
-"of the integrity of the package can not be verified. Installing the package\n"
-"may put the integrity of your system at risk.\n"
-"\n"
-"Do you want to install it anyway?"
-msgstr ""
-
-#. popup question, %1 stands for the filename
-#: src/modules/SignatureCheckDialogs.ycp:137
-#, ycp-format
-msgid ""
-"The file '%1' is not digitally signed. This means that the origin\n"
-"of the integrity of the file can not be verified. Using the file\n"
-"may put the integrity of your system at risk.\n"
-"\n"
-"Do you want to use it anyway?"
-msgstr ""
-
-#. popup heading
-#: src/modules/SignatureCheckDialogs.ycp:150
-msgid "Signature Check Failed"
-msgstr ""
-
-#. popup question, %1 stands for the package name
-#: src/modules/SignatureCheckDialogs.ycp:177
-#, ycp-format
-msgid ""
-"The integrity check for package '%1' failed. This means that\n"
-"the package has been changed by accident or by an attacker\n"
-"since the repository creator has signed it. Installing it\n"
-"is a big risk for the integrity and security of your system.\n"
-"\n"
-"Do you want to install it anyway?"
-msgstr ""
-
-#. popup question, %1 stands for the filename
-#: src/modules/SignatureCheckDialogs.ycp:185
-#, ycp-format
-msgid ""
-"The integrity check for file '%1' failed. This means that\n"
-"the file has been changed by accident or by an attacker\n"
-"since the repository creator has signed it. Installing it\n"
-"is a big risk for the integrity and security of your system.\n"
-"\n"
-"Do you want to use it anyway?"
-msgstr ""
-
-#: src/modules/SignatureCheckDialogs.ycp:199
-msgid "Validation Check Failed"
-msgstr ""
-
-#. popup question, %1 stands for the package name, %2 for the key ID
-#: src/modules/SignatureCheckDialogs.ycp:226
-#, ycp-format
-msgid ""
-"The package '%1' is digitally signed with an unknown GnuPG key '%2'\n"
-"and we cannot find that key. This means that a trust relationship to the creator of the package\n"
-"can not be established. Installing the package may put the integrity of your system at risk.\n"
-"\n"
-"Do you want to install it anyway?"
-msgstr ""
-
-#. popup question, %1 stands for the filename, %2 for the key ID
-#: src/modules/SignatureCheckDialogs.ycp:233
-#, ycp-format
-msgid ""
-"The file '%1' is digitally signed with an unknown GnuPG key '%2'\n"
-"and we cannot find that key. This means that a trust relationship to the creator of the file\n"
-"can not be established. Using the file may put the integrity of your system at risk.\n"
-"\n"
-"Do you want to use it anyway?"
-msgstr ""
-
-#. popup heading
-#: src/modules/SignatureCheckDialogs.ycp:246
-msgid "Uknown GnuPG Key"
-msgstr ""
-
-#. popup question, %1 stands for the package name
-#: src/modules/SignatureCheckDialogs.ycp:278
-#, ycp-format
-msgid ""
-"The package '%1' is digitally signed\n"
-"with key '%2 (%3)'.\n"
-"There is no trust relationship to the owner of the key. You may chose to import\n"
-"the key into your set of trusted keys in the Import dialog and then proceed\n"
-"with the installation. You can also chose just to install the package anyway,\n"
-"but be aware that packages from untrusted sources can put the integrity\n"
-"of your system at risk."
-msgstr ""
-
-#. popup question, %1 stands for the filename
-#: src/modules/SignatureCheckDialogs.ycp:287
-#, ycp-format
-msgid ""
-"The file '%1' is digitally signed\n"
-"with key '%2 (%3)'.\n"
-"There is no trust relationship to the owner of the key. You may chose to import\n"
-"the key into your set of trusted keys in the Import dialog and then proceed\n"
-"with the installation. You can also chose just to use the file anyway,\n"
-"but be aware that packages from untrusted sources can put the integrity\n"
-"of your system at risk."
-msgstr ""
-
-#. popup heading
-#: src/modules/SignatureCheckDialogs.ycp:302
-msgid "Signed with Untrusted Public Key"
-msgstr ""
-
-#. push button
-#: src/modules/SignatureCheckDialogs.ycp:308
-msgid "Key &Import Dialog"
-msgstr ""
-
-#. push button
-#: src/modules/SignatureCheckDialogs.ycp:310
-msgid "Install &Anyway"
-msgstr ""
-
-#. push button
-#: src/modules/SignatureCheckDialogs.ycp:312
-msgid "&Skip Package"
-msgstr ""
-
-#. FIXME: add somewhere this additional text
-#. additional warning text (kind of help)
-#: src/modules/SignatureCheckDialogs.ycp:337
-#, ycp-format
-msgid ""
-"The owner of the key may distribute updates, packages and package repositories\n"
-"that will be considered trusted by your system and which will be offered for installation\n"
-"and update without any further warning. Importing the key thus allows the key owner\n"
-"to have a certain amount of control over the software on your system and you should\n"
-"only do this if you trust her/him. YaST comes up with a warning dialog for every\n"
-"package that's not signed by a trusted (imported) key; this will happen to packages\n"
-"by the package creator with key '%1' if you chose not to import."
-msgstr ""
-
-#. popup heading
-#: src/modules/SignatureCheckDialogs.ycp:351
-msgid "Import Public GnuPG Key"
-msgstr ""
-
-#. popup message, %1 stands for GPG key ID, %2 for key name, %3 for key location (URL or ...)
-#: src/modules/SignatureCheckDialogs.ycp:356
-#, ycp-format
-msgid ""
-"The GnuPG key '%1 (%2)' has been found\n"
-"on location '%3'.\n"
-"\n"
-"You can chose to import it into your keyring of trusted public keys - that means\n"
-"you trust the owner of the key. You should be sure that you can trust the owner\n"
-"and that the key really belongs to that owner before considering to import it."
-msgstr ""
-
-#. push button
-#: src/modules/SignatureCheckDialogs.ycp:366
-msgid "&Import"
-msgstr ""
-
-#. push button
-#. tab
-#: src/modules/SignatureCheckDialogs.ycp:368 src/modules/SlideShow.ycp:1493
-msgid "&Details"
-msgstr ""
-
-#. push button
-#: src/modules/SignatureCheckDialogs.ycp:370
-msgid "Do &Not Import"
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/src/clients/dirinstall.ycp new/yast2-packager-2.13.56/src/clients/dirinstall.ycp
--- old/yast2-packager-2.13.55/src/clients/dirinstall.ycp 2006-02-03 08:47:49.000000000 +0100
+++ new/yast2-packager-2.13.56/src/clients/dirinstall.ycp 2006-03-29 13:38:43.000000000 +0200
@@ -9,6 +9,12 @@
{
textdomain "packager";
+ import "PackageLock";
+ // check whether having the packager for ourselves
+ if (! PackageLock::Check ())
+ return `abort;
+
+ // constructor calls Pkg::
import "DirInstall";
include "dirinstall/ui.ycp";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/src/clients/inst_source.ycp new/yast2-packager-2.13.56/src/clients/inst_source.ycp
--- old/yast2-packager-2.13.55/src/clients/inst_source.ycp 2006-03-21 15:32:20.000000000 +0100
+++ new/yast2-packager-2.13.56/src/clients/inst_source.ycp 2006-03-29 10:55:57.000000000 +0200
@@ -15,6 +15,7 @@
import "Mode";
import "Installation";
import "PackageCallbacksInit";
+ import "PackageLock";
import "SLP";
import "Wizard";
@@ -28,7 +29,7 @@
Wizard::SetContents(_("Initializing..."), `Empty (), "", false, true);
// check whether running as root
- if (! Confirm::MustBeRoot ())
+ if (! Confirm::MustBeRoot () || ! PackageLock::Check ())
{
UI::CloseDialog ();
return (any)`abort;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/src/clients/sw_single.ycp new/yast2-packager-2.13.56/src/clients/sw_single.ycp
--- old/yast2-packager-2.13.55/src/clients/sw_single.ycp 2006-03-16 17:33:14.000000000 +0100
+++ new/yast2-packager-2.13.56/src/clients/sw_single.ycp 2006-03-30 10:51:55.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 29058 2006-03-16 16:33:12Z locilka $
+ * $Id: sw_single.ycp 29549 2006-03-30 08:51:49Z mvidner $
*/
{
@@ -20,6 +20,7 @@
import "Mode";
import "Packages";
import "PackageCallbacks";
+ import "PackageLock";
import "SlideShow";
import "SlideShowCallbacks";
import "Kernel";
@@ -175,18 +176,19 @@
// =============================================================
- Pkg::SetLocale (UI::GetLanguage (true));
-
Wizard::CreateDialog();
Wizard::SetDesktopIcon("sw_single");
// check whether running as root
- if (! Confirm::MustBeRoot ())
+ // and having the packager for ourselves
+ if (! Confirm::MustBeRoot () || ! PackageLock::Check ())
{
UI::CloseDialog ();
return `abort;
}
+ Pkg::SetLocale (UI::GetLanguage (true));
+
// check Args
// set test_mode, test_popup
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/src/clients/test.ycp new/yast2-packager-2.13.56/src/clients/test.ycp
--- old/yast2-packager-2.13.55/src/clients/test.ycp 2006-03-27 15:55:00.000000000 +0200
+++ new/yast2-packager-2.13.56/src/clients/test.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,156 +0,0 @@
-{
- textdomain "packager";
- import "Service";
- import "Message";
-
- /**
- * Runs a bash command with timeout.
- * @struct Returns map $[
- * "exit" : int_return_code,
- * "stdout" : [ "script", "stdout", "lines" ],
- * "stderr" : [ "script", "stderr", "lines" ],
- * ]
- *
- * @param string command
- * @param integer timeout in sec.
- * @return map with out, err and ret_code
- */
- map RunCommandWithTimeout (string run_command, integer script_time_out) {
- y2milestone("Running command \"%1\" in background...", run_command);
-
- boolean started = (boolean) SCR::Execute(.background.run_output_err, run_command);
- if (!started) {
- y2error("Cannot run '%1'", run_command);
- return nil;
- }
-
- list<string> script_out = [];
- list<string> script_err = [];
- integer time_spent = 0;
- integer return_code = nil;
- boolean cont_loop = true;
- integer sleep_step = 20;
- script_time_out = script_time_out * 1000;
-
- // while continuing is needed and while it is possible
- while (cont_loop && ((boolean) SCR::Read(.background.output_open) || (integer) SCR::Read(.background.pid) > 0)) {
- // time-out
- if (time_spent >= script_time_out) {
- y2error("Command '%1' timed-out after %2 mces", run_command, time_spent);
- cont_loop = false;
- }
-
- time_spent = time_spent + sleep_step;
- sleep(sleep_step);
- }
- y2milestone("Time spent: %1 msec", time_spent);
-
- // fetching the return code if not timed-out
- if (cont_loop) {
- script_out = (list<string>) SCR::Read(.background.newout);
- script_err = (list<string>) SCR::Read(.background.newerr);
- return_code = (integer) SCR::Read(.background.status);
- }
- SCR::Execute(.background.kill, "");
-
- map command_ret = $[
- "exit" : return_code,
- "stdout" : script_out,
- "stderr" : script_err,
- ];
- return command_ret;
- }
-
- /**
- * Returns count of services matching the pattern. Returns 'nil'
- * if something fails.
- *
- * @param string grep_pattern to match the ZYPP service
- * @return integer count of matching lines
- */
- integer CountOfZMDServicesMatching (string grep_pattern) {
- map ret = RunCommandWithTimeout(
- sformat("TERM=dumb /usr/bin/rug service-list; exit $?"),
- 60
- );
- if (ret != nil && ret["stdout"]:nil != nil) {
- list <string> matching = filter (string one_line, (list <string>) ret["stdout"]:[], {
- return regexpmatch(one_line, grep_pattern);
- });
- return size(matching);
- } else {
- y2error("Counting of services failed, returned %1", ret);
- return nil;
- }
- }
-
- /* Adds a ZYPP service into ZMD */
- boolean AddZYPPServiceIntoZMD () {
- map ret = RunCommandWithTimeout(
- "TERM=dumb /usr/bin/rug service-add --type=zypp /installation; rug subscribe zypp; exit $?",
- 60
- );
- if (ret != nil && ret["exit"]:nil == 0) {
- return true;
- } else {
- y2error("Adding ZYPP service failed, returned %1", ret);
- return false;
- }
- }
-
- /**
- * Checks whether ZMD is running, starts it when isn't. Checks whether a ZYPP source is listed
- * in the ZMD services, adds one if it is missing.
- * Everything is done via the .background agent with timeout (number in seconds).
- */
- boolean SyncYaSTInstSourceWithZMD () {
- // Notes for maintainer:
- // - using .background agent because of ZMD/rug call that can stuck
- // - using 'exit $?' that work well with ZMD/rug and .background together
- // - using TERM=dumb to suppress colors, progress bars etc. from ZMD/rug
-
- y2milestone("--- Syncing YaST inst source with ZMD ---");
- string zmd_service_name = "/etc/init.d/novell-zmd";
- string rug_command = "/usr/bin/rug";
-
- // Check the ZMD status and start if not running, using 'exit $?' because of buggy behavior '.background vs. ZMD'
- map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60);
- y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
- if (zmd_status == nil || zmd_status["exit"]:nil != 0) {
- // Starting the service
- map zmd_start = RunCommandWithTimeout(sformat("TERM=dumb %1 start; exit $?", zmd_service_name), 60);
- y2milestone("ZMD start: %1", zmd_start);
- // Checking the status after start
- map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60);
- y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
- if (zmd_status == nil || zmd_status["exit"]:nil != 0) {
- Message::CannotStartService(zmd_service_name);
- y2error("Cannot start service %1, returned %2", zmd_service_name, zmd_status);
- y2milestone("--- Syncing finished ---");
- return false;
- }
- }
-
- // Check whether the ZYPP service is already in zmd db or not
- integer count_of_services = CountOfZMDServicesMatching(".*ZYPP.*/installation.*");
- if (count_of_services == nil) {
- y2warning("Cannot get list of services...");
- } else if (count_of_services > 0) {
- y2milestone("ZYPP service already presented (%1)", count_of_services);
- y2milestone("--- Syncing finished ---");
- return true;
- }
-
- // Count of services were 'nil' or '0'
- if (AddZYPPServiceIntoZMD()) {
- y2milestone("Adding ZYPP service succeeded");
- } else {
- y2error("Adding ZYPP service failed");
- }
-
- y2milestone("--- Syncing finished ---");
- return true;
- }
-
- SyncYaSTInstSourceWithZMD();
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.56/src/modules/SignatureCheckDialogs.ycp
--- old/yast2-packager-2.13.55/src/modules/SignatureCheckDialogs.ycp 2006-03-29 13:47:33.000000000 +0200
+++ new/yast2-packager-2.13.56/src/modules/SignatureCheckDialogs.ycp 2006-03-30 10:49:57.000000000 +0200
@@ -300,19 +300,23 @@
with key '%2 (%3)'.
There is no trust relationship to the owner of the key.
-If you trust the owner, import the key into your set
-of trusted keys then proceed with the installation.
+If you trust the owner, import the key into your set of
+trusted keys with Import Key then proceed
+with the installation.
+
Installing a package from an unknown source can put
the integrity of your system at risk. It is safest
to skip the package.")
:
// popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name
- _("The file '%1' is digitally signed
+ _("The file %1 is digitally signed
with key '%2 (%3)'.
There is no trust relationship to the owner of the key.
-If you trust the owner, import the key into your set
-of trusted keys then proceed with the installation.
+If you trust the owner, import the key into your set of
+trusted keys with Import Key then proceed with
+the installation.
+
Installing a file from an unknown source can put
the integrity of your system at risk. It is safest
to skip it.")
@@ -330,7 +334,7 @@
`MarginBox(0.5, 0.5, `Label(description_text)),
`HBox (
// push button
- `PushButton(`id(`key_import), _("&Import Key")),
+ `PushButton(`id(`key_import), _("&Import Key...")),
`HSpacing(1),
// push button
`PushButton(`id(`install), _("Install &Anyway")),
@@ -363,17 +367,21 @@
string warning_text = sformat(_("<p>The owner of the key may distribute updates,
packages, and package repositories that your system will trust and offer
for installation and update without any further warning. In this way,
-importing the key allows the key owner to have a certain amount of control
-over the software on your system.</p>
+importing the key into your keyring of trusted keys allows the key owner
+to have a certain amount of control over the software on your system.</p>
-<p>Only trust a key if you are confident that the owner can be trusted.
-A warning dialog opens for every package that is not signed by a trusted (imported) key.
-If you do not import the key, packages created by the owner of key '%1'
-show this warning.</p>"), key_id);
+<p>Only trust a key if you are confident that the key really belongs to the owner
+and that the owner can be trusted. With <b>Details</b>, get
+more information on the key, such as a fingerprint and signatures
+that can help you determine the trustworthiness of the key.</p>
+
+<p>A warning dialog opens for every package that
+is not signed by a trusted (imported) key. If you do not import the key,
+packages created by the owner of key <tt>%1</tt> show this warning.</p>"), key_id);
// popup message, %1 stands for GPG key ID, %2 for key name, %3 for key location (URL or ...)
string dialog_text = sformat(_("The GnuPG key '%1 (%2)'
-has been found at '%3'.
+has been found at %3.
You can choose to import it into your keyring of trusted
public keys, meaning that you trust the owner of the key.
@@ -414,7 +422,7 @@
`PushButton(`id(`import), _("&Import")),
`HSpacing(1),
// push button
- `PushButton(`id(`details), _("&Details")),
+ `PushButton(`id(`details), _("&Details...")),
`HSpacing(1),
// push button
`PushButton(`id(`dont_import), _("Do &Not Import"))
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...