![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package yast2-packager checked in at Tue Apr 25 18:22:09 CEST 2006. -------- --- yast2-packager/yast2-packager.changes 2006-04-25 15:41:47.000000000 +0200 +++ STABLE/yast2-packager/yast2-packager.changes 2006-04-25 17:25:05.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Apr 25 17:22:44 CEST 2006 - jsrain@suse.de + +- fixed checking of add_on_products on CD1 + +------------------------------------------------------------------- +Tue Apr 25 17:20:31 CEST 2006 - mvidner@suse.cz + +- Rug and zmd timeout should not be necessary having fixed #165821, + but 2 minutes is too short. Increasing it to 30 min everywhere just + to be safe (#165753). +- 2.13.97 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.96.tar.bz2 New: ---- yast2-packager-2.13.97.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.d0rtxH/_old 2006-04-25 18:20:47.000000000 +0200 +++ /var/tmp/diff_new_pack.d0rtxH/_new 2006-04-25 18:20:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.96) +# spec file for package yast2-packager (Version 2.13.97) # # 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.96 +Version: 2.13.97 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.96.tar.bz2 +Source0: yast2-packager-2.13.97.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@suse.de> %prep -%setup -n yast2-packager-2.13.96 +%setup -n yast2-packager-2.13.97 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,13 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Tue Apr 25 2006 - jsrain@suse.de +- fixed checking of add_on_products on CD1 +* Tue Apr 25 2006 - mvidner@suse.cz +- Rug and zmd timeout should not be necessary having fixed #165821, + but 2 minutes is too short. Increasing it to 30 min everywhere just + to be safe (#165753). +- 2.13.97 * Tue Apr 25 2006 - locilka@suse.cz - Improved GnuPG dialogs for changed zypp and pkg-bindings to display the full URL and not to break visibility. ++++++ yast2-packager-2.13.96.tar.bz2 -> yast2-packager-2.13.97.tar.bz2 ++++++ ++++ 2423 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.96/VERSION new/yast2-packager-2.13.97/VERSION --- old/yast2-packager-2.13.96/VERSION 2006-04-25 13:46:27.000000000 +0200 +++ new/yast2-packager-2.13.97/VERSION 2006-04-25 17:13:05.000000000 +0200 @@ -1 +1 @@ -2.13.96 +2.13.97 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.96/configure.in new/yast2-packager-2.13.97/configure.in --- old/yast2-packager-2.13.96/configure.in 2006-04-25 16:29:12.000000000 +0200 +++ new/yast2-packager-2.13.97/configure.in 2006-04-25 17:39:35.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.96, http://www.suse.de/feedback, yast2-packager) +AC_INIT(yast2-packager, 2.13.97, 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.96" +VERSION="2.13.97" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain@suse.cz>" 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.96/src/modules/Packages.ycp new/yast2-packager-2.13.97/src/modules/Packages.ycp --- old/yast2-packager-2.13.96/src/modules/Packages.ycp 2006-04-24 13:10:01.000000000 +0200 +++ new/yast2-packager-2.13.97/src/modules/Packages.ycp 2006-04-25 17:36:04.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif@suse.de> * - * $Id: Packages.ycp 30366 2006-04-21 21:16:48Z jsrain $ + * $Id: Packages.ycp 30465 2006-04-25 15:36:00Z mvidner $ */ { @@ -596,8 +596,15 @@ SlideShow::SetSlideDir (our_slidedir); string tmp_add_on_products = Pkg::SourceProvideOptionalFile (initial_source, 1, "/add_on_products"); - add_on_products_list = ((string)SCR::Read (.target.tmpdir)) + "/add_on_products"; - WFM::Execute (.local.bash, sformat ("cp %1 %2", tmp_add_on_products, add_on_products_list)); + if (tmp_add_on_products != nil) + { + add_on_products_list = ((string)SCR::Read (.target.tmpdir)) + "/add_on_products"; + WFM::Execute (.local.bash, sformat ("cp %1 %2", tmp_add_on_products, add_on_products_list)); + } + else + { + add_on_products_list = nil; + } /* Check for Service Pack */ boolean servicepack_available = false; 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.96/src/modules/SourceManager.ycp new/yast2-packager-2.13.97/src/modules/SourceManager.ycp --- old/yast2-packager-2.13.96/src/modules/SourceManager.ycp 2006-04-25 15:42:23.000000000 +0200 +++ new/yast2-packager-2.13.97/src/modules/SourceManager.ycp 2006-04-25 17:20:50.000000000 +0200 @@ -7,7 +7,7 @@ * Martin Vidner <mvidner@suse.cz> * Status: Work in Progress * - * $Id: SourceManager.ycp 30452 2006-04-25 13:42:13Z locilka $ + * $Id: SourceManager.ycp 30463 2006-04-25 15:20:43Z mvidner $ * * Representation of the configuration of source-manager. * Input and output routines. @@ -799,7 +799,7 @@ */ boolean CheckZMDStatus () { string rug_command = "/usr/bin/rug"; - map zmd_status = RunShort (rug_command + " ping >/dev/null"); + map zmd_status = RunLong (rug_command + " ping >/dev/null"); y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]); return zmd_status["exit"]:nil == 0; } @@ -812,7 +812,7 @@ * @return integer count of matching lines */ integer CountOfZMDServicesMatching (string grep_pattern) { - map ret = RunShort ("/usr/bin/rug service-list"); + map ret = RunLong ("/usr/bin/rug service-list"); if (ret["stdout"]:nil != nil) { list <string> matching = filter (string one_line, (list <string>) ret["stdout"]:[], { return regexpmatch(one_line, grep_pattern); @@ -901,7 +901,7 @@ zmd_handle ["was_running"] = running; if (! running) { // Starting the service - map zmd_start = RunShort (zmd_service_name + " start"); + map zmd_start = RunLong (zmd_service_name + " start"); y2milestone("ZMD start: %1", zmd_start); } // Checking the status after start @@ -935,7 +935,7 @@ if (zmd_handle["is_running"]:false) { y2milestone("Stopping service ZMD %1", zmd_service_name); - map zmd_stop = RunShort (zmd_service_name + " stop"); + map zmd_stop = RunLong (zmd_service_name + " stop"); y2milestone("ZMD stop: %1", zmd_stop); if (zmd_stop["exit"]:nil != 0) { Report::Error(Message::CannotStopService(zmd_service_name)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de