Hello community,
here is the log from the commit of package yast2-packager
checked in at Thu Jul 5 00:28:40 CEST 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-06-21 17:39:44.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-07-04 11:38:52.000000000 +0200
@@ -2 +2 @@
-Thu Jun 21 17:39:38 CEST 2007 - adrian@suse.de
+Wed Jul 4 10:57:55 CEST 2007 - locilka@suse.cz
@@ -4 +4,9 @@
-- fix changelog entry order
+- Callback function for setting the trust level to the GnuPG key
+ has been merged with a function for importing the same key. By
+ now, if key is trusted, it's also imported (#282254).
+- 2.15.43
+
+-------------------------------------------------------------------
+Thu Jun 28 21:34:57 CEST 2007 - jsrain@suse.cz
+
+- updated for live CD installation
@@ -2366,5 +2373,0 @@
-Wed Mar 2 17:52:44 CET 2005 - sh@suse.de
-
-- Renamed some icons in .desktop files (name clashes)
-
--------------------------------------------------------------------
@@ -2391,0 +2395,5 @@
+Wed Mar 2 17:52:44 CET 2005 - sh@suse.de
+
+- Renamed some icons in .desktop files (name clashes)
+
+-------------------------------------------------------------------
@@ -3245,6 +3252,0 @@
-Tue Aug 26 15:53:09 CEST 2003 - kkaempf@suse.de
-
-- don't release the sources in sw_single any more, the package-
- manager handles this.
-
--------------------------------------------------------------------
@@ -3257,0 +3260,6 @@
+Tue Aug 26 15:53:09 CEST 2003 - kkaempf@suse.de
+
+- don't release the sources in sw_single any more, the package-
+ manager handles this.
+
+-------------------------------------------------------------------
@@ -3893,8 +3900,0 @@
-Mon Sep 9 14:34:00 CEST 2002 - kkaempf@suse.de
-
-- call solver after activating selections
-- allow installing list of packages from ascii file
-- fix filtering network related data from install.inf
-- 2.6.33
-
--------------------------------------------------------------------
@@ -3908,0 +3909,8 @@
+Mon Sep 9 14:34:00 CEST 2002 - kkaempf@suse.de
+
+- call solver after activating selections
+- allow installing list of packages from ascii file
+- fix filtering network related data from install.inf
+- 2.6.33
+
+-------------------------------------------------------------------
@@ -3992,6 +3999,0 @@
-Thu Aug 29 16:14:29 CEST 2002 - kkaempf@suse.de
-
-- symlink /dev/cdrom for DVD too
-- 2.6.19
-
--------------------------------------------------------------------
@@ -4003,0 +4006,6 @@
+Thu Aug 29 16:14:29 CEST 2002 - kkaempf@suse.de
+
+- symlink /dev/cdrom for DVD too
+- 2.6.19
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.42.tar.bz2
New:
----
yast2-packager-2.15.43.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.E13884/_old 2007-07-05 00:27:21.000000000 +0200
+++ /var/tmp/diff_new_pack.E13884/_new 2007-07-05 00:27:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.42)
+# spec file for package yast2-packager (Version 2.15.43)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,21 +11,21 @@
# norootforbuild
Name: yast2-packager
-Version: 2.15.42
-Release: 8
-License: GNU General Public License (GPL)
+Version: 2.15.43
+Release: 1
+License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.42.tar.bz2
+Source0: yast2-packager-2.15.43.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
-BuildRequires: yast2 >= 2.15.22
+BuildRequires: yast2 >= 2.15.38
Requires: yast2-country
Requires: yast2-installation >= 2.15.12
# Pkg::SourceGetBrokenSources()
Requires: yast2-pkg-bindings >= 2.15.16
-# WorkflowManager module
-Requires: yast2 >= 2.15.22
+# Mode::live_installation
+Requires: yast2 >= 2.15.38
# unzipping license file
Requires: unzip
Provides: yast2-config-package-manager
@@ -49,7 +49,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.15.42
+%setup -n yast2-packager-2.15.43
%build
%{prefix}/bin/y2tool y2autoconf
@@ -88,8 +88,13 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
-* Thu Jun 21 2007 - adrian@suse.de
-- fix changelog entry order
+* Wed Jul 04 2007 - locilka@suse.cz
+- Callback function for setting the trust level to the GnuPG key
+ has been merged with a function for importing the same key. By
+ now, if key is trusted, it's also imported (#282254).
+- 2.15.43
+* Thu Jun 28 2007 - jsrain@suse.cz
+- updated for live CD installation
* Fri Jun 01 2007 - locilka@suse.cz
- Adjusted Add-On module to store also a "PRODUCT" tag from the
product content file to be later used by AutoYaST cloning.
++++++ yast2-packager-2.15.42.tar.bz2 -> yast2-packager-2.15.43.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.42/configure new/yast2-packager-2.15.43/configure
--- old/yast2-packager-2.15.42/configure 2007-06-05 16:36:46.000000000 +0200
+++ new/yast2-packager-2.15.43/configure 2007-07-04 11:39:15.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.42.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.43.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.15.42'
-PACKAGE_STRING='yast2-packager 2.15.42'
+PACKAGE_VERSION='2.15.43'
+PACKAGE_STRING='yast2-packager 2.15.43'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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.15.42 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.15.43 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.15.42:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.15.43:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.15.42
+yast2-packager configure 2.15.43
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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.15.42, which was
+It was created by yast2-packager $as_me 2.15.43, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.15.42'
+ VERSION='2.15.43'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.42"
+VERSION="2.15.43"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3260,7 +3260,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.15.42, which was
+This file was extended by yast2-packager $as_me 2.15.43, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3303,7 +3303,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.15.42
+yast2-packager config.status 2.15.43
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.42/configure.in new/yast2-packager-2.15.43/configure.in
--- old/yast2-packager-2.15.42/configure.in 2007-06-05 16:36:41.000000000 +0200
+++ new/yast2-packager-2.15.43/configure.in 2007-07-04 11:39:11.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.15.42, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.43, 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.42"
+VERSION="2.15.43"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.42/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.15.43/src/clients/inst_rpmcopy.ycp
--- old/yast2-packager-2.15.42/src/clients/inst_rpmcopy.ycp 2007-05-18 10:43:17.000000000 +0200
+++ new/yast2-packager-2.15.43/src/clients/inst_rpmcopy.ycp 2007-07-02 14:02:38.000000000 +0200
@@ -13,7 +13,7 @@
* Packages module :
* "installed"
*
- * $Id: inst_rpmcopy.ycp 37526 2007-04-18 11:50:31Z locilka $
+ * $Id: inst_rpmcopy.ycp 39090 2007-06-28 19:35:39Z jsrain $
*/
{
@@ -846,7 +846,7 @@
// Initialize and check whether some packages need to be installed
// stop proceeding the script if they don't (Second stage)
- if (Stage::cont()) {
+ if (Stage::cont() && ! Mode::live_installation ()) {
InitRemainingPackages();
if (SomePackagesAreRemainForInstallation() != true) {
y2milestone ("No packages need to be installed, skipping...");
@@ -871,7 +871,7 @@
RemoveObsoleteResolvables();
}
- if (Stage::cont()) {
+ if (Stage::cont() && ! Mode::live_installation ()) {
// initialize the package agent in continue mode
Packages::Init( true );
RestoreDiskCacheSettings ();
@@ -891,7 +891,7 @@
InstInitAndInitialSourceCaching();
// continue mode, set remaining packages to be installed
- } else {
+ } else if (! Mode::live_installation ()){
InstallRemainingAndBinarySource();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.42/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.15.43/src/modules/SignatureCheckDialogs.ycp
--- old/yast2-packager-2.15.42/src/modules/SignatureCheckDialogs.ycp 2007-05-18 10:43:18.000000000 +0200
+++ new/yast2-packager-2.15.43/src/modules/SignatureCheckDialogs.ycp 2007-07-02 16:35:42.000000000 +0200
@@ -595,6 +595,13 @@
}
/**
+ * List of trusted keys
+ *
+ * @see bugzilla #282254
+ */
+ list <string> list_of_trusted_keys = [];
+
+ /**
* Used for file or package signed by a public key. This key is still
* not listed in trusted keys.
*
@@ -641,7 +648,7 @@
`MarginBox(0.5, 0.5, `Label(description_text)),
`HBox (
// push button
- `PushButton(`id(`trust), _("&Trust the Key")),
+ `PushButton(`id(`trust), _("&Trust and Import the Key")),
`HSpacing(1),
`PushButton(`id(`skip), Label::SkipButton())
)
@@ -652,6 +659,13 @@
// wait for one of listed ID's, return the default value in case of `cancel
symbol ret = WaitForSymbolUserInput([`trust, `skip], `skip);
+ if (ret == `trust) {
+ // later, if asking whether to import the key, the key is trusted
+ // so it will be also imported
+ // bugzilla #282254
+ list_of_trusted_keys = add (list_of_trusted_keys, key_id);
+ }
+
UI::CloseDialog();
return ret;
}
@@ -766,6 +780,12 @@
* @return boolean whether zypp should import the key into the keyring of trusted keys
*/
global boolean ImportGPGKeyIntoTrustedDialog (string key_id, string key_name, string fingerprint) {
+ // bugzilla #282254
+ if (key_id != "" && key_id != nil && contains (list_of_trusted_keys, key_id)) {
+ y2milestone ("Key '%1' is trusted, importing...", key_id);
+ return true;
+ }
+
// additional Richtext (HTML) warning text (kind of help), 1/2
string warning_text = _("<p>The owner of the key may distribute updates,
packages, and package repositories that your system will trust and offer
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.42/VERSION new/yast2-packager-2.15.43/VERSION
--- old/yast2-packager-2.15.42/VERSION 2007-06-05 16:36:22.000000000 +0200
+++ new/yast2-packager-2.15.43/VERSION 2007-07-04 11:38:43.000000000 +0200
@@ -1 +1 @@
-2.15.42
+2.15.43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org