Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri Apr 7 13:12:57 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-04-06 19:57:45.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-04-07 12:38:24.000000000 +0200
@@ -1,0 +2,18 @@
+Fri Apr 7 12:36:38 CEST 2006 - jsuchome@suse.cz
+
+- import gpg keys before creating source (#164001)
+- 2.13.71
+
+-------------------------------------------------------------------
+Fri Apr 7 11:39:14 CEST 2006 - kkaempf@suse.de
+
+- call rug with source type 'zypp' instead of 'yast'.
+- 2.13.70
+
+-------------------------------------------------------------------
+Fri Apr 7 09:39:29 CEST 2006 - locilka@suse.cz
+
+- Disabling [Details...] button in ImportGPGKeyDialogs when no
+ details are available.
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.69.tar.bz2
New:
----
yast2-packager-2.13.71.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.YKSbyU/_old 2006-04-07 13:12:13.000000000 +0200
+++ /var/tmp/diff_new_pack.YKSbyU/_new 2006-04-07 13:12:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.69)
+# spec file for package yast2-packager (Version 2.13.71)
#
# 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.69
+Version: 2.13.71
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.69.tar.bz2
+Source0: yast2-packager-2.13.71.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.69
+%setup -n yast2-packager-2.13.71
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,15 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Fri Apr 07 2006 - jsuchome@suse.cz
+- import gpg keys before creating source (#164001)
+- 2.13.71
+* Fri Apr 07 2006 - kkaempf@suse.de
+- call rug with source type 'zypp' instead of 'yast'.
+- 2.13.70
+* Fri Apr 07 2006 - locilka@suse.cz
+- Disabling [Details...] button in ImportGPGKeyDialogs when no
+ details are available.
* Thu Apr 06 2006 - mvidner@suse.cz
- Only add the alias parameter to rug sa for --type=ZYPP (#164083).
- 2.13.69
++++++ yast2-packager-2.13.69.tar.bz2 -> yast2-packager-2.13.71.tar.bz2 ++++++
++++ 2262 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.69/Makefile.am new/yast2-packager-2.13.71/Makefile.am
--- old/yast2-packager-2.13.69/Makefile.am 2006-04-06 20:11:45.000000000 +0200
+++ new/yast2-packager-2.13.71/Makefile.am 2006-04-07 11:33:00.000000000 +0200
@@ -154,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,9 +199,6 @@
false; \
fi
-check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
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.69/VERSION new/yast2-packager-2.13.71/VERSION
--- old/yast2-packager-2.13.69/VERSION 2006-04-06 19:54:34.000000000 +0200
+++ new/yast2-packager-2.13.71/VERSION 2006-04-07 12:36:34.000000000 +0200
@@ -1 +1 @@
-2.13.69
+2.13.71
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.69/configure.in new/yast2-packager-2.13.71/configure.in
--- old/yast2-packager-2.13.69/configure.in 2006-04-06 20:11:44.000000000 +0200
+++ new/yast2-packager-2.13.71/configure.in 2006-04-07 11:33:00.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.69, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.70, 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.69"
+VERSION="2.13.70"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain "
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.69/src/modules/Packages.ycp new/yast2-packager-2.13.71/src/modules/Packages.ycp
--- old/yast2-packager-2.13.69/src/modules/Packages.ycp 2006-04-06 19:53:16.000000000 +0200
+++ new/yast2-packager-2.13.71/src/modules/Packages.ycp 2006-04-07 12:37:43.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 29822 2006-04-06 17:37:34Z jsrain $
+ * $Id: Packages.ycp 29872 2006-04-07 10:37:38Z jsuchome $
*/
{
@@ -520,6 +520,11 @@
integer initial_source = nil;
while (initial_source == nil)
{
+ map out = (map) SCR::Execute (.target.bash_output, "/bin/ls -d /*.gpg");
+ foreach (string file, splitstring (out["stdout"]:"", "\n"), {
+ if (file != "")
+ Pkg::ImportGPGKey (file, true);
+ });
initial_source = Pkg::SourceCreate (base_url, "");
if (initial_source == nil)
{
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.69/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.71/src/modules/SignatureCheckDialogs.ycp
--- old/yast2-packager-2.13.69/src/modules/SignatureCheckDialogs.ycp 2006-04-06 16:31:57.000000000 +0200
+++ new/yast2-packager-2.13.71/src/modules/SignatureCheckDialogs.ycp 2006-04-07 11:23:04.000000000 +0200
@@ -550,7 +550,10 @@
)
)
);
- UI::SetFocus(`details);
+
+ // No details available - disable button
+ if (key_detailed_description == "") UI::ChangeWidget(`id(`details), `Enabled, false);
+ UI::SetFocus(`dont_import);
symbol ret = nil;
while (ret == nil || ret == `details) {
@@ -642,6 +645,9 @@
)
)
);
+
+ // No details available - disable button
+ if (key_detailed_description == "") UI::ChangeWidget(`id(`details), `Enabled, false);
UI::SetFocus(`dont_import);
symbol ret = nil;
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.69/src/modules/SourceManager.ycp new/yast2-packager-2.13.71/src/modules/SourceManager.ycp
--- old/yast2-packager-2.13.69/src/modules/SourceManager.ycp 2006-04-06 19:57:50.000000000 +0200
+++ new/yast2-packager-2.13.71/src/modules/SourceManager.ycp 2006-04-07 12:35:16.000000000 +0200
@@ -7,7 +7,7 @@
* Martin Vidner
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 29827 2006-04-06 17:57:47Z mvidner $
+ * $Id: SourceManager.ycp 29861 2006-04-07 09:38:58Z kkaempf $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -794,16 +794,17 @@
boolean AddOrDeleteZYPPServiceIntoZMD (integer src_id, boolean adding) {
map gendata = Pkg::SourceGeneralData (src_id);
string stype = gendata["type"]:"";
+ if (stype == "YaST") stype = "zypp"; /* 'rug' only accepts yum or zypp */
string url = gendata["url"]:"";
// ZMD must have unique URIs, so we append the alias
string alias = gendata["alias"]:"";
y2milestone ("id: %1, type: %2, url: %3, alias: %4", src_id, stype, url, alias);
if (stype == "" || url == "" || alias == "") {
- y2error ("ugh");
+ y2error ("Internal error: stype, url, or alias is empty ?!");
return false;
}
- if (stype == "ZYPP") // yum sources do not need+understand the alias
+ if (stype == "zypp") // yum sources do not need+understand the alias
{
// URL (un)escapes for us
// maybe a bug with "="?
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...