Mailinglist Archive: opensuse-commit (1187 mails)

< Previous Next >
commit yast2-packager
  • From: root@xxxxxxx (h_root)
  • Date: Mon, 24 Apr 2006 17:34:10 +0200 (CEST)
  • Message-id: <20060424153410.21CB08C454@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-packager
checked in at Mon Apr 24 17:34:10 CEST 2006.

--------
--- yast2-packager/yast2-packager.changes 2006-04-21 23:21:05.000000000 +0200
+++ STABLE/yast2-packager/yast2-packager.changes 2006-04-24 16:58:39.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Apr 24 16:58:36 CEST 2006 - mvidner@xxxxxxx
+
+- Always tell rug that zypp owns the source (#168739).
+- 2.13.95
+
+-------------------------------------------------------------------
+Mon Apr 24 12:53:53 CEST 2006 - locilka@xxxxxxx
+
+- modified help texts for importing GnuPG keys to make removing
+ the [Details...] button possible. Leaving the old ones unchanged.
+- splitting displayed fingerprint with space after every 4th
+ character
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.4p2ReH/_old 2006-04-24 17:33:52.000000000 +0200
+++ /var/tmp/diff_new_pack.4p2ReH/_new 2006-04-24 17:33:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.93)
+# spec file for package yast2-packager (Version 2.13.95)
#
# 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.93
+Version: 2.13.95
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.93.tar.bz2
+Source0: yast2-packager-2.13.95.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.93
+%setup -n yast2-packager-2.13.95

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

%changelog -n yast2-packager
+* Mon Apr 24 2006 - mvidner@xxxxxxx
+- Always tell rug that zypp owns the source (#168739).
+- 2.13.95
+* Mon Apr 24 2006 - locilka@xxxxxxx
+- modified help texts for importing GnuPG keys to make removing
+ the [Details...] button possible. Leaving the old ones unchanged.
+- splitting displayed fingerprint with space after every 4th
+ character
* Fri Apr 21 2006 - jsrain@xxxxxxx
- create 1st source as source containing base product (#160585)
- 2.13.93

++++++ yast2-packager-2.13.93.tar.bz2 -> yast2-packager-2.13.95.tar.bz2 ++++++
++++ 1635 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.93/Makefile.am new/yast2-packager-2.13.95/Makefile.am
--- old/yast2-packager-2.13.93/Makefile.am 2006-04-21 23:20:33.000000000 +0200
+++ new/yast2-packager-2.13.95/Makefile.am 2006-04-24 16:59:19.000000000 +0200
@@ -8,6 +8,7 @@

#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool

VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -95,7 +96,7 @@
done

pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)

install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +117,7 @@
fi

spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck

# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))

@@ -143,20 +144,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done

package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local

-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion

check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -200,12 +201,12 @@
fi

check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+ $(Y2TOOL) check-textdomain $(srcdir)

stable: checkin-stable

checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable


# For po/ modules
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.93/VERSION new/yast2-packager-2.13.95/VERSION
--- old/yast2-packager-2.13.93/VERSION 2006-04-21 23:18:56.000000000 +0200
+++ new/yast2-packager-2.13.95/VERSION 2006-04-24 16:57:51.000000000 +0200
@@ -1 +1 @@
-2.13.93
+2.13.95
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.93/configure.in new/yast2-packager-2.13.95/configure.in
--- old/yast2-packager-2.13.93/configure.in 2006-04-21 23:20:33.000000000 +0200
+++ new/yast2-packager-2.13.95/configure.in 2006-04-24 16:59:18.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.17 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-packager, 2.13.93, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.95, 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.93"
+VERSION="2.13.95"
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.93/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.95/src/modules/SignatureCheckDialogs.ycp
--- old/yast2-packager-2.13.93/src/modules/SignatureCheckDialogs.ycp 2006-04-21 22:01:52.000000000 +0200
+++ new/yast2-packager-2.13.95/src/modules/SignatureCheckDialogs.ycp 2006-04-24 16:49:45.000000000 +0200
@@ -16,6 +16,11 @@
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 = $[];
@@ -109,6 +114,36 @@

/* --------------------------- Don't show this dialog again Magic --------------------------- */

+ /**
+ * Function adds delimiter between after_chars characters in the string
+ *
+ * @param string to be splitted
+ * @param string delimiter
+ * @param integer after characters
+ * @return string with delimiters
+ */
+ string StringSplitter(string whattosplit, string delimiter, integer after_chars) {
+ string splittedstring = "";
+ integer after_chars_counter = 0;
+ integer max_size = size(whattosplit);
+
+ while (true) {
+ if ((after_chars_counter + after_chars) >= max_size) {
+ splittedstring = splittedstring +
+ (splittedstring == "" ? "":delimiter) +
+ substring(whattosplit, after_chars_counter);
+ break;
+ } else {
+ splittedstring = splittedstring +
+ (splittedstring == "" ? "":delimiter) +
+ substring(whattosplit, after_chars_counter, after_chars);
+ after_chars_counter = after_chars_counter + after_chars;
+ }
+ }
+
+ return splittedstring;
+ }
+
// Defining icons for dialogs
map <string, string> msg_icons = $[
"error" : "/usr/share/YaST2/theme/current/icons/32x32/apps/msg_error.png",
@@ -375,7 +410,7 @@
Install it anyway?")
),
item_name,
- ((fingerprint == nil || fingerprint == "") ? key_id : sformat("%1\n %2\n", key_id, fingerprint)),
+ ((fingerprint == nil || fingerprint == "") ? key_id : sformat("%1\n %2\n", key_id, StringSplitter(fingerprint, " ", 4))),
key_name
);

@@ -435,7 +470,7 @@
),
item_name,
// If fingerprint is defined, show it
- ((fingerprint == nil || fingerprint == "") ? key_id : sformat("%1\n%2", key_id, fingerprint))
+ ((fingerprint == nil || fingerprint == "") ? key_id : sformat("%1\n%2", key_id, StringSplitter(fingerprint, " ", 4)))
);

UI::OpenDialog(
@@ -566,6 +601,18 @@
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);

+ // additional Richtext (HTML) warning text (kind of help), 1/2
+ string warning_help_text_1 = _("<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>");
+
+ // 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
+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.
@@ -665,6 +712,18 @@
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);

+ // additional Richtext (HTML) warning text (kind of help), 1/2
+ string warning_help_text_1 = _("<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>");
+
+ // 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
+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.
@@ -673,7 +732,7 @@
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, fingerprint)),
+ ((fingerprint == nil || fingerprint == "") ? key_id : sformat("%1\n %2\n", key_id, StringSplitter(fingerprint, " ", 4))),
key_name
);

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.93/src/modules/SourceManager.ycp new/yast2-packager-2.13.95/src/modules/SourceManager.ycp
--- old/yast2-packager-2.13.93/src/modules/SourceManager.ycp 2006-04-21 22:01:52.000000000 +0200
+++ new/yast2-packager-2.13.95/src/modules/SourceManager.ycp 2006-04-24 16:58:47.000000000 +0200
@@ -7,7 +7,7 @@
* Martin Vidner <mvidner@xxxxxxx>
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 30301 2006-04-20 15:41:26Z mvidner $
+ * $Id: SourceManager.ycp 30417 2006-04-24 14:58:42Z mvidner $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -831,7 +831,7 @@
*/
boolean AddOrDeleteZYPPServiceIntoZMD (integer src_id, boolean adding) {
map gendata = Pkg::SourceGeneralData (src_id);
- string stype = gendata["type"]:"";
+ string stype = gendata["type"]:""; // metadata 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
@@ -842,7 +842,10 @@
return false;
}

- if (stype == "zypp") // yum sources do not need+understand the alias
+ // yum sources do not need+understand the alias, #164083
+ // The above reason is obsolete but we keep compatibility with
+ // the service-delete zmd helper
+ if (stype == "zypp")
{
// URL (un)escapes for us
// maybe a bug with "="?
@@ -859,12 +862,13 @@
y2milestone ("zmd url: %1", url);

string name = alias;
+ string owner = "zypp"; // not stype: #168739

string command = nil;
if (adding) {
command = sformat (
"/usr/bin/rug service-add --type='%3' '%1' '%2' && /usr/bin/rug subscribe '%1'",
- url, name, stype
+ url, name, owner
);
}
else {


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



Remember to have fun...


< Previous Next >