Mailinglist Archive: opensuse-commit (1187 mails)

< Previous Next >
commit yast2-packager
  • From: root@xxxxxxx (h_root)
  • Date: Tue, 25 Apr 2006 17:38:59 +0200 (CEST)
  • Message-id: <20060425153859.EE29A8C468@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-packager
checked in at Tue Apr 25 17:38:59 CEST 2006.

--------
--- yast2-packager/yast2-packager.changes 2006-04-24 16:58:39.000000000 +0200
+++ STABLE/yast2-packager/yast2-packager.changes 2006-04-25 15:41:47.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Apr 25 13:47:36 CEST 2006 - locilka@xxxxxxx
+
+- Improved GnuPG dialogs for changed zypp and pkg-bindings
+ to display the full URL and not to break visibility.
+- Adding Progress popup information when syncing ZMD/YaST sources
+ (#168742)
+- 2.13.96
+
+-------------------------------------------------------------------

Old:
----
yast2-packager-2.13.95.tar.bz2

New:
----
yast2-packager-2.13.96.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.VIadkh/_old 2006-04-25 17:37:29.000000000 +0200
+++ /var/tmp/diff_new_pack.VIadkh/_new 2006-04-25 17:37:29.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.95)
+# spec file for package yast2-packager (Version 2.13.96)
#
# 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.95
+Version: 2.13.96
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.95.tar.bz2
+Source0: yast2-packager-2.13.96.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 <arvin@xxxxxxx>

%prep
-%setup -n yast2-packager-2.13.95
+%setup -n yast2-packager-2.13.96

%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,12 @@
%doc %{prefix}/share/doc/packages/yast2-packager

%changelog -n yast2-packager
+* Tue Apr 25 2006 - locilka@xxxxxxx
+- Improved GnuPG dialogs for changed zypp and pkg-bindings
+ to display the full URL and not to break visibility.
+- Adding Progress popup information when syncing ZMD/YaST sources
+ (#168742)
+- 2.13.96
* Mon Apr 24 2006 - mvidner@xxxxxxx
- Always tell rug that zypp owns the source (#168739).
- 2.13.95

++++++ yast2-packager-2.13.95.tar.bz2 -> yast2-packager-2.13.96.tar.bz2 ++++++
++++ 2731 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.13.95/VERSION new/yast2-packager-2.13.96/VERSION
--- old/yast2-packager-2.13.95/VERSION 2006-04-24 16:57:51.000000000 +0200
+++ new/yast2-packager-2.13.96/VERSION 2006-04-25 13:46:27.000000000 +0200
@@ -1 +1 @@
-2.13.95
+2.13.96
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.13.95/configure.in new/yast2-packager-2.13.96/configure.in
--- old/yast2-packager-2.13.95/configure.in 2006-04-24 16:59:18.000000000 +0200
+++ new/yast2-packager-2.13.96/configure.in 2006-04-25 16:29:12.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-packager, 2.13.95, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.96, 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.95"
+VERSION="2.13.96"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"

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.13.95/src/modules/SignatureCheckCallbacks.ycp new/yast2-packager-2.13.96/src/modules/SignatureCheckCallbacks.ycp
--- old/yast2-packager-2.13.95/src/modules/SignatureCheckCallbacks.ycp 2006-04-20 17:40:23.000000000 +0200
+++ new/yast2-packager-2.13.96/src/modules/SignatureCheckCallbacks.ycp 2006-04-25 11:41:54.000000000 +0200
@@ -40,6 +40,15 @@
}


+ // Name of the callback handler function. Required callback prototype is
+ // boolean(string filename) The callback function should ask user whether
+ // the unsigned file can be accepted, returned true value means to accept the file.
+ //
+ // zypp: askUserToAcceptNoDigest
+ //
+ // (+DontShowAgain functionality) -- for one run in memory
+ //
+ /* function for CallbackAcceptFileWithoutChecksum() */
global boolean AcceptFileWithoutChecksum (string filename) {
string dont_show_dialog_ident = "-AcceptFileWithoutChecksum-";

@@ -85,7 +94,7 @@
/* function for CallbackImportGpgKey() */
global boolean ImportGpgKey (string keyid, string keyname, string fingerprint) {
// There are no details from the callback, maybe in the future
- return SignatureCheckDialogs::ImportUntrustedGPGKeyIntoTrustedDialog(keyid, keyname, fingerprint, "");
+ return SignatureCheckDialogs::ImportUntrustedGPGKeyIntoTrustedDialog(keyid, keyname, fingerprint);
}

// Name of the callback handler function. Required callback prototype is
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.13.95/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.96/src/modules/SignatureCheckDialogs.ycp
--- old/yast2-packager-2.13.95/src/modules/SignatureCheckDialogs.ycp 2006-04-24 16:49:45.000000000 +0200
+++ new/yast2-packager-2.13.96/src/modules/SignatureCheckDialogs.ycp 2006-04-25 14:05:43.000000000 +0200
@@ -16,11 +16,6 @@
import "Popup";
import "Message";

- // GnuPG fingerprint used as "Fingerprint: AAA BBB CCC"
- string f_string = _("Fingerprint");
- // GnuPG key ID used as "Key ID: 1144AAAA444"
- string f_k_id = _("Key ID");
-
/* --------------------------- Don't show this dialog again Magic --------------------------- */

map <string, boolean> show_popup = $[];
@@ -144,6 +139,13 @@
return splittedstring;
}

+ /* Standard text strings */
+
+ // GnuPG fingerprint used as "Fingerprint: AAA BBB CCC"
+ string s_fingerprint = _("Fingerprint");
+ // GnuPG key ID used as "Key ID: 1144AAAA444"
+ string s_keyid = _("Key ID");
+
// Defining icons for dialogs
map <string, string> msg_icons = $[
"error" : "/usr/share/YaST2/theme/current/icons/32x32/apps/msg_error.png",
@@ -281,9 +283,9 @@
Install it anyway?")
:
// popup question, %1 stands for the filename
- _("The file %1 is not digitally signed.
-This means that the origin and integrity of the file cannot be verified.
-Using the file may put the integrity of your system at risk.
+ _("The file %1
+is not digitally signed. This means that the origin and integrity of the file
+cannot be verified. Using the file may put the integrity of your system at risk.

Use it anyway?")
), item_name);
@@ -337,10 +339,10 @@
Install it anyway?")
:
// popup question, %1 stands for the filename
- _("No checksum for file %1 was found in the source.
-This means that the file is part of the signed source, but the list of checksums
-on this source does not mention this package. Installing the file may put
-the integrity of your system at risk.
+ _("No checksum for file %1
+was found in the source. This means that the file is part of the signed source,
+but the list of checksums on this source does not mention this file. Using the file
+may put the integrity of your system at risk.

Use it anyway?")
), item_name);
@@ -387,10 +389,8 @@
*/
global boolean UseCorruptedItem (symbol item_type, string item_name, string key_id, string key_name, string fingerprint) {
string description_text = sformat((item_type == `package ?
- // popup question, %1 stands for the package name, %2 for the key ID, %3 for the key name
- _("Package %1 is signed with
-GnuPG key '%2 (%3)'
-but the integrity check failed.
+ // popup question, %1 stands for the package name, %2 for the complete description of the GnuPG key (multiline)
+ _("Package %1 is signed with the following GnuPG key, but the integrity check failed: %2

This means that the package has been changed by accident or by an attacker
since the repository creator signed it. Installing it is a big risk
@@ -398,20 +398,25 @@

Install it anyway?")
:
- // popup question, %1 stands for the filename
- _("File %1 is signed with
-GnuPG key '%2 (%3)'
-but the integrity check failed.
+ // popup question, %1 stands for the filename, %2 for the complete description of the GnuPG key (multiline)
+ _("File %1
+is signed with the following GnuPG key, but the integrity check failed: %2

This means that the file has been changed by accident or by an attacker
-since the repository creator signed it. Installing it is a big risk
+since the repository creator signed it. Using it is a big risk
for the integrity and security of your system.

-Install it anyway?")
+Use it anyway?")
),
item_name,
- ((fingerprint == nil || fingerprint == "") ? key_id : sformat("%1\n %2\n", key_id, StringSplitter(fingerprint, " ", 4))),
- key_name
+ "\n\n" +
+ // Part of the GnuPG key description in popup, %1 is a GnuPG key ID
+ sformat(_("ID: %1"), key_id) + "\n" +
+ ((fingerprint == nil || fingerprint == "") ?
+ // Part of the GnuPG key description in popup, %1 is a GnuPG key fingerprint
+ "" : sformat(_("Fingerprint: %1") + "\n", StringSplitter(fingerprint, " ", 4))) +
+ // Part of the GnuPG key description in popup, %1 is a GnuPG key name
+ sformat(_("Name: %1"), key_name)
);

UI::OpenDialog(
@@ -448,9 +453,9 @@
*/
global boolean ItemSignedWithUnknownSignature (symbol item_type, string item_name, string key_id, string fingerprint, string dont_show_dialog_ident) {
string description_text = sformat((item_type == `package ?
- // popup question, %1 stands for the package name, %2 for the key ID
+ // popup question, %1 stands for the package name, %2 for the complex multiline description of the GnuPG key
_("The package %1 is digitally signed
-with the unknown GnuPG key '%2'.
+with the following unknown GnuPG key: %2.

This means that a trust relationship to the creator of the package
cannot be established. Installing the package may put the integrity
@@ -458,9 +463,9 @@

Install it anyway?")
:
- // popup question, %1 stands for the filename, %2 for the key ID
- _("The file %1 is digitally signed
-with the unknown GnuPG key '%2'.
+ // popup question, %1 stands for the filename, %2 for the complex multiline description of the GnuPG key
+ _("The file %1
+is digitally signed with the following unknown GnuPG key: %2.

This means that a trust relationship to the creator of the file
cannot be established. Using the file may put the integrity
@@ -469,8 +474,12 @@
Use it anyway?")
),
item_name,
- // If fingerprint is defined, show it
- ((fingerprint == nil || fingerprint == "") ? key_id : sformat("%1\n%2", key_id, StringSplitter(fingerprint, " ", 4)))
+ "\n" +
+ // Part of the GnuPG key description in popup, %1 is a GnuPG key ID
+ sformat(_("ID: %1"), key_id) +
+ ((fingerprint == nil || fingerprint == "") ?
+ // Part of the GnuPG key description in popup, %1 is a GnuPG key fingerprint
+ "" : sformat("\n" + _("Fingerprint: %1"), StringSplitter(fingerprint, " ", 4)))
);

UI::OpenDialog(
@@ -581,48 +590,38 @@
* @param string key_id
* @param string key_name
* @param string key_location
- * @param string key_detailed_description
+ * @param string key_fingerprint
* @return symbol
*/
- global symbol ImportGPGKeyDialog (string key_id, string key_name, string key_location, string key_detailed_description) {
- // additional Richtext (HTML) warning text (kind of help), %1 stands for the key ID
- 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 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 key really belongs to the owner
-and that the owner can be trusted. With <b>Details</b>, get
-more information about 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);
-
+ global symbol ImportGPGKeyDialog (string key_id, string key_name, string key_location, string fingerprint) {
// additional Richtext (HTML) warning text (kind of help), 1/2
- string warning_help_text_1 = _("<p>The owner of the key may distribute updates,
+ string warning_text = _("<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 into your keyring of trusted keys allows the key owner
-to have a certain amount of control over the software on your system.</p>");
+to have a certain amount of control over the software on your system.</p>") +

// additional Richtext (HTML) warning text (kind of help), 2/2, %1 stands for the GnuPG key ID
- string warning_help_text_2 = sformat(_("<p>A warning dialog opens for every package that
+ sformat(_("<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.
+ // popup message, %1 stands for GPG key complete multiline description, %2 for key location (URL or ...)
+ string dialog_text = sformat(_("The GnuPG key %1
+has been found at %2.

You can choose to import it into your keyring of trusted
public keys, meaning that you trust the owner of the key.
You should be sure that you can trust the owner and that
the key really belongs to that owner before importing it."),
- key_id,
- key_name,
+ "\n" +
+ // Part of the GnuPG key description in popup, %1 is a GnuPG key ID
+ sformat(_("ID: %1"), key_id) + "\n" +
+ ((fingerprint == nil || fingerprint == "") ?
+ // Part of the GnuPG key description in popup, %1 is a GnuPG key fingerprint
+ "" : sformat(_("Fingerprint: %1") + "\n", StringSplitter(fingerprint, " ", 4))) +
+ // Part of the GnuPG key description in popup, %1 is a GnuPG key name
+ sformat(_("Name: %1"), key_name),
key_location
);

@@ -659,8 +658,8 @@
`PushButton(`id(`import), _("&Import")),
`HSpacing(1),
// push button
- `PushButton(`id(`details), _("&Details...")),
- `HSpacing(1),
+ //`PushButton(`id(`details), _("&Details...")),
+ //`HSpacing(1),
// push button
`PushButton(`id(`dont_import), _("Do &Not Import"))
)
@@ -671,7 +670,7 @@
);

// No details available - disable button
- if (key_detailed_description == "") UI::ChangeWidget(`id(`details), `Enabled, false);
+ // if (key_detailed_description == "") UI::ChangeWidget(`id(`details), `Enabled, false);
UI::SetFocus(`dont_import);

symbol ret = nil;
@@ -679,7 +678,7 @@
// wait for one of listed ID's, return the default value in case of `cancel
ret = WaitForSymbolUserInput([`import, `details, `dont_import], `dont_import);
if (contains([`import, `dont_import], ret)) break;
- else if (ret == `details) Popup::LongMessage(key_detailed_description);
+ // else if (ret == `details) Popup::LongMessage(key_detailed_description);
}

UI::CloseDialog();
@@ -692,48 +691,36 @@
* @param string key_id
* @param string key_name
* @param string fingerprint
- * @param string key_detailed_description
* @return boolean whether zypp should import the key into the keyring of trusted keys
*/
- global boolean ImportUntrustedGPGKeyIntoTrustedDialog (string key_id, string key_name, string fingerprint, string key_detailed_description) {
- // additional Richtext (HTML) warning text (kind of help), %1 stands for the key ID
- 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 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 key really belongs to the owner
-and that the owner can be trusted. With <b>Details</b>, get
-more information about 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);
-
+ global boolean ImportUntrustedGPGKeyIntoTrustedDialog (string key_id, string key_name, string fingerprint) {
// additional Richtext (HTML) warning text (kind of help), 1/2
- string warning_help_text_1 = _("<p>The owner of the key may distribute updates,
+ string warning_text = _("<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 into your keyring of trusted keys allows the key owner
-to have a certain amount of control over the software on your system.</p>");
+to have a certain amount of control over the software on your system.</p>") +

// additional Richtext (HTML) warning text (kind of help), 2/2, %1 stands for the GnuPG key ID
- string warning_help_text_2 = sformat(_("<p>A warning dialog opens for every package that
+ sformat(_("<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 string "GPG key ID\nfingerprint", %2 for key name
- string dialog_text = sformat(_("The GnuPG key '%1 (%2)'
-has been found.
+ string dialog_text = sformat(_("The following GnuPG key has been found: %1

You can choose to import it into your keyring of trusted
public keys, meaning that you trust the owner of the key.
You should be sure that you can trust the owner and that
the key really belongs to that owner before importing it."),
- ((fingerprint == nil || fingerprint == "") ? key_id : sformat("%1\n %2\n", key_id, StringSplitter(fingerprint, " ", 4))),
- key_name
+ "\n" +
+ // Part of the GnuPG key description in popup, %1 is a GnuPG key ID
+ sformat(_("ID: %1"), key_id) + "\n" +
+ ((fingerprint == nil || fingerprint == "") ?
+ // Part of the GnuPG key description in popup, %1 is a GnuPG key fingerprint
+ "" : sformat(_("Fingerprint: %1") + "\n", StringSplitter(fingerprint, " ", 4))) +
+ // Part of the GnuPG key description in popup, %1 is a GnuPG key name
+ sformat(_("Name: %1"), key_name)
);

UI::OpenDialog(
@@ -769,8 +756,8 @@
`PushButton(`id(`import), _("&Import")),
`HSpacing(1),
// push button
- `PushButton(`id(`details), _("&Details...")),
- `HSpacing(1),
+ //`PushButton(`id(`details), _("&Details...")),
+ //`HSpacing(1),
// push button
`PushButton(`id(`dont_import), _("Do &Not Import"))
)
@@ -781,7 +768,7 @@
);

// No details available - disable button
- if (key_detailed_description == "") UI::ChangeWidget(`id(`details), `Enabled, false);
+ // if (key_detailed_description == "") UI::ChangeWidget(`id(`details), `Enabled, false);
UI::SetFocus(`dont_import);

symbol ret = nil;
@@ -789,7 +776,7 @@
// wait for one of listed ID's, return the default value in case of `cancel
ret = WaitForSymbolUserInput([`import, `details, `dont_import], `dont_import);
if (contains([`import, `dont_import], ret)) break;
- else if (ret == `details) Popup::LongMessage(key_detailed_description);
+ // else if (ret == `details) Popup::LongMessage(key_detailed_description);
}

UI::CloseDialog();
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.13.95/src/modules/SourceManager.ycp new/yast2-packager-2.13.96/src/modules/SourceManager.ycp
--- old/yast2-packager-2.13.95/src/modules/SourceManager.ycp 2006-04-24 16:58:47.000000000 +0200
+++ new/yast2-packager-2.13.96/src/modules/SourceManager.ycp 2006-04-25 15:42:23.000000000 +0200
@@ -7,7 +7,7 @@
* Martin Vidner <mvidner@xxxxxxx>
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 30417 2006-04-24 14:58:42Z mvidner $
+ * $Id: SourceManager.ycp 30452 2006-04-25 13:42:13Z locilka $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -963,6 +963,8 @@
// the RPM database. You can run it only when the RPM is not locked
// otherwise the ZMD will block itself!

+ // popup progress information
+ UI::OpenDialog (`Label(_("Initializing catalogs...")));
y2milestone("--- Syncing YaST inst source with ZMD ---");

boolean ret = false;
@@ -1007,6 +1009,7 @@
ZMDRestore (zmd_handle);

y2milestone("--- Syncing finished ---");
+ UI::CloseDialog();
return ret;
}



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


< Previous Next >