Hello community,
here is the log from the commit of package yast2-installation
checked in at Thu Jun 15 21:00:31 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-06-15 13:08:36.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2006-06-15 18:42:15.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Jun 15 18:47:05 CEST 2006 - mvidner@suse.cz
+
+- Do not complain if ZMD cannot be stopped (#166900).
+- When syncing the _original_ installation sources to ZMD,
+ temporarily turn off signature checking because the user has
+ already decided to trust the sources (#182747).
+- SourceManager: factored out the rug pathname.
+- 2.13.130
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.129.tar.bz2
New:
----
yast2-installation-2.13.130.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.Iju1j8/_old 2006-06-15 20:59:55.000000000 +0200
+++ /var/tmp/diff_new_pack.Iju1j8/_new 2006-06-15 20:59:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.129)
+# spec file for package yast2-installation (Version 2.13.130)
#
# 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-installation
-Version: 2.13.129
+Version: 2.13.130
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.129.tar.bz2
+Source0: yast2-installation-2.13.130.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite
Requires: yast2 yast2-update
@@ -51,7 +51,7 @@
Arvin Schnell
%prep
-%setup -n yast2-installation-2.13.129
+%setup -n yast2-installation-2.13.130
%build
%{prefix}/bin/y2tool y2autoconf
@@ -119,6 +119,13 @@
/usr/X11R6/share/fvwm/
%changelog -n yast2-installation
+* Thu Jun 15 2006 - mvidner@suse.cz
+- Do not complain if ZMD cannot be stopped (#166900).
+- When syncing the _original_ installation sources to ZMD,
+ temporarily turn off signature checking because the user has
+ already decided to trust the sources (#182747).
+- SourceManager: factored out the rug pathname.
+- 2.13.130
* Thu Jun 15 2006 - jsrain@suse.cz
- set installation server as host name (not IP address) if it is
defined as host name during installation (#178933)
++++++ yast2-installation-2.13.129.tar.bz2 -> yast2-installation-2.13.130.tar.bz2 ++++++
++++ 1942 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-installation-2.13.129/VERSION new/yast2-installation-2.13.130/VERSION
--- old/yast2-installation-2.13.129/VERSION 2006-06-15 12:46:42.000000000 +0200
+++ new/yast2-installation-2.13.130/VERSION 2006-06-15 14:48:05.000000000 +0200
@@ -1 +1 @@
-2.13.129
+2.13.130
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-installation-2.13.129/configure.in new/yast2-installation-2.13.130/configure.in
--- old/yast2-installation-2.13.129/configure.in 2006-06-15 13:06:57.000000000 +0200
+++ new/yast2-installation-2.13.130/configure.in 2006-06-15 18:44:06.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.13.129, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.13.130, http://bugs.opensuse.org/, yast2-installation)
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.129"
+VERSION="2.13.130"
RPMNAME="yast2-installation"
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-installation-2.13.129/control/docs/control-doc.xml new/yast2-installation-2.13.130/control/docs/control-doc.xml
--- old/yast2-installation-2.13.129/control/docs/control-doc.xml 2005-01-24 07:41:33.000000000 +0100
+++ new/yast2-installation-2.13.130/control/docs/control-doc.xml 2005-04-19 15:34:02.000000000 +0200
@@ -28,7 +28,7 @@
0.1
</revnumber>
<date>
- $Date: 2004-10-27 16:25:24 +0200 (Wed, 27 Oct 2004) $
+ $Date: 2004-10-27 16:25:24 +0200 (St, 27 říj 2004) $
</date>
<revremark>Initial Release as PDF</revremark>
</revision>
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-installation-2.13.129/src/modules/SourceManager.ycp new/yast2-installation-2.13.130/src/modules/SourceManager.ycp
--- old/yast2-installation-2.13.129/src/modules/SourceManager.ycp 2006-06-07 09:10:06.000000000 +0200
+++ new/yast2-installation-2.13.130/src/modules/SourceManager.ycp 2006-06-15 18:42:25.000000000 +0200
@@ -7,7 +7,7 @@
* Martin Vidner
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 31348 2006-06-06 17:24:39Z mvidner $
+ * $Id: SourceManager.ycp 31496 2006-06-15 16:42:17Z mvidner $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -815,11 +815,15 @@
}
/**
+ * path to ZMD CLI
+ */
+ const string rug = "/usr/bin/rug";
+
+ /**
* Detect whether ZMD is running
*/
boolean CheckZMDStatus () {
- string rug_command = "/usr/bin/rug";
- map zmd_status = RunLong (rug_command + " ping >/dev/null");
+ map zmd_status = RunLong (rug + " ping >/dev/null");
y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
// Argh zis suks so mutch! #170549
return zmd_status["exit"]:nil == 0 || zmd_status["stderr"]:[] == [];
@@ -859,7 +863,7 @@
{
//format: "3|Active|ZYPP|ServiceName|ftp://example.org/update/10.1"
// With empty lines and "Waking up ZMD...Done" as a distraction
- map ret = RunLong ("/usr/bin/rug --no-abbrev --terse service-list | cut -d'|' -f5 --only-delimited");
+ map ret = RunLong (rug + " --no-abbrev --terse service-list | cut -d'|' -f5 --only-delimited");
if (ret["stdout"]:nil == nil) {
y2error("Listing of services failed, returned %1", ret);
return nil;
@@ -872,6 +876,29 @@
}
/**
+ * Get a ZMD preference
+ * @param pref see "rug get-prefs"
+ */
+ string RugGetPref (string pref) {
+ // "pref|value"
+ map ret = RunLong (sformat ("%1 --terse get-prefs %2 | cut -d'|' -f2 --only-delimited", rug, pref));
+ if (ret["stdout"]:nil == nil) {
+ y2error("GetPref failed, returned %1", ret);
+ return nil;
+ }
+ string line = ret["stdout", 0]:"";
+ return deletechars (line, "\n");
+ }
+
+ /**
+ * Set a ZMD preference
+ */
+ void RugSetPref (string pref, string value) {
+ map ret = RunLong (sformat ("%1 set-prefs %2 '%3'", rug, pref, value));
+ y2milestone ("ret %1", ret);
+ }
+
+ /**
* Adds a ZYPP service into ZMD
* @param src_id installation source id
* @return success
@@ -924,12 +951,12 @@
// be quiet, #179080
if (adding) {
command = sformat (
- "/usr/bin/rug --quiet service-add --type='%3' '%1' '%2' && /usr/bin/rug subscribe '%1'",
- url, name, owner
+ "%4 --quiet service-add --type='%3' '%1' '%2' && %4 subscribe '%1'",
+ url, name, owner, rug
);
}
else {
- command = sformat ("/usr/bin/rug --quiet service-delete '%1'", url);
+ command = sformat ("%2 --quiet service-delete '%1'", url, rug);
}
map ret = RunLong (command); // #165145
if (ret["exit"]:nil == 0) {
@@ -947,6 +974,7 @@
message = message + "\n" + mergestring (ret["stderr"]:[], "\n");
else if (haskey (ret, "timed_out"))
// error message
+ // FIXME "ms" or plural gettext
message = message + "\n" + sformat (_("Command timed out after %1 milliseconds."), ret["timed_out"]:1000);
Report::LongError (message);
return false;
@@ -1003,7 +1031,9 @@
y2milestone("Stopping service ZMD %1", zmd_service_name);
map zmd_stop = RunLong (zmd_service_name + " stop");
y2milestone("ZMD stop: %1", zmd_stop);
- if (zmd_stop["exit"]:nil != 0) {
+ // #166900, if stop fails it means it is still busy and
+ // will stop later
+ if (false && zmd_stop["exit"]:nil != 0) {
Report::Error(Message::CannotStopService(zmd_service_name));
}
}
@@ -1081,6 +1111,12 @@
// now we can work
if (true) {
+ string zmd_security_level = RugGetPref ("security-level");
+ // The user has already decided to trust the inst sources
+ // otherwise we would not be here. Do not ask again.
+ // #182747
+ RugSetPref ("security-level", "none");
+
list<integer> src_ids = Pkg::SourceGetCurrent (true /*enabled only?*/);
ResetKnownServiceCache ();
boolean added_ok = true;
@@ -1094,6 +1130,12 @@
y2error("Adding ZYPP service failed");
}
ret = added_ok;
+
+ // restore
+ if (zmd_security_level != nil)
+ {
+ RugSetPref ("security-level", zmd_security_level);
+ }
}
}
ZMDRestore (zmd_handle);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org