Hello community, here is the log from the commit of package yast2-packager checked in at Wed Apr 19 15:53:41 CEST 2006. -------- --- yast2-packager/yast2-packager.changes 2006-04-19 00:32:10.000000000 +0200 +++ STABLE/yast2-packager/yast2-packager.changes 2006-04-19 15:09:48.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Apr 19 15:04:30 CEST 2006 - jsuchome@suse.cz + +- after finishing sources configuration, restart menu.ycp (#162966) +- 2.13.90 + +------------------------------------------------------------------- +Wed Apr 19 14:56:04 CEST 2006 - mvidner@suse.cz + +- Fixed a false timeout when calling rug (#165821). +- Really increased the rug timeout (#165145#c11). +- 2.13.89 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.88.tar.bz2 New: ---- yast2-packager-2.13.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.cBG4ob/_old 2006-04-19 15:53:32.000000000 +0200 +++ /var/tmp/diff_new_pack.cBG4ob/_new 2006-04-19 15:53:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.88) +# spec file for package yast2-packager (Version 2.13.90) # # 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.88 +Version: 2.13.90 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.88.tar.bz2 +Source0: yast2-packager-2.13.90.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.88 +%setup -n yast2-packager-2.13.90 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,13 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Wed Apr 19 2006 - jsuchome@suse.cz +- after finishing sources configuration, restart menu.ycp (#162966) +- 2.13.90 +* Wed Apr 19 2006 - mvidner@suse.cz +- Fixed a false timeout when calling rug (#165821). +- Really increased the rug timeout (#165145#c11). +- 2.13.89 * Wed Apr 19 2006 - jsrain@suse.de - inform in the log that installation was aborted (#157322) - 2.13.88 ++++++ yast2-packager-2.13.88.tar.bz2 -> yast2-packager-2.13.90.tar.bz2 ++++++ ++++ 1693 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.88/Makefile.am new/yast2-packager-2.13.90/Makefile.am --- old/yast2-packager-2.13.88/Makefile.am 2006-04-19 00:32:54.000000000 +0200 +++ new/yast2-packager-2.13.90/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.88/VERSION new/yast2-packager-2.13.90/VERSION --- old/yast2-packager-2.13.88/VERSION 2006-04-19 00:30:45.000000000 +0200 +++ new/yast2-packager-2.13.90/VERSION 2006-04-19 15:05:10.000000000 +0200 @@ -1 +1 @@ -2.13.88 +2.13.90 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.88/configure.in new/yast2-packager-2.13.90/configure.in --- old/yast2-packager-2.13.88/configure.in 2006-04-19 00:32:54.000000000 +0200 +++ new/yast2-packager-2.13.90/configure.in 2006-04-07 11:33:00.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.88, 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.88" +VERSION="2.13.70" 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.88/src/clients/inst_source.ycp new/yast2-packager-2.13.90/src/clients/inst_source.ycp --- old/yast2-packager-2.13.88/src/clients/inst_source.ycp 2006-04-12 16:52:32.000000000 +0200 +++ new/yast2-packager-2.13.90/src/clients/inst_source.ycp 2006-04-19 14:39:47.000000000 +0200 @@ -658,5 +658,7 @@ y2debug( "Return: %1", input ); + if (input == `next && Mode::normal ()) + input = `restart_menu; return input; } 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.88/src/modules/SourceManager.ycp new/yast2-packager-2.13.90/src/modules/SourceManager.ycp --- old/yast2-packager-2.13.88/src/modules/SourceManager.ycp 2006-04-12 16:52:32.000000000 +0200 +++ new/yast2-packager-2.13.90/src/modules/SourceManager.ycp 2006-04-19 15:01:47.000000000 +0200 @@ -7,7 +7,7 @@ * Martin Vidner <mvidner@suse.cz> * Status: Work in Progress * - * $Id: SourceManager.ycp 30024 2006-04-12 09:20:54Z mvidner $ + * $Id: SourceManager.ycp 30238 2006-04-19 12:56:24Z mvidner $ * * Representation of the configuration of source-manager. * Input and output routines. @@ -699,7 +699,7 @@ * @param integer timeout in sec. * @return map with out, err and ret_code */ - map RunCommandWithTimeout (string run_command, integer script_time_out) { + global map RunCommandWithTimeout (string run_command, integer script_time_out) { y2milestone("Running command "%1" in background...", run_command); boolean started = (boolean) SCR::Execute(.background.run_output_err, run_command); @@ -712,16 +712,32 @@ list<string> script_err = []; integer time_spent = 0; integer return_code = nil; - boolean cont_loop = true; - integer sleep_step = 20; + boolean timed_out = false; + integer sleep_step = 200; // ms script_time_out = script_time_out * 1000; // while continuing is needed and while it is possible - while (cont_loop && ((boolean) SCR::Read(.background.output_open) || (integer) SCR::Read(.background.pid) > 0)) { + while (! timed_out) { + boolean running = (boolean) SCR::Read(.background.isrunning); + // debugging #165821 + if (time_spent % 100000 == 0) { + y2milestone ("running: %1", running); + string flag = "/tmp/SourceManagerTimeout"; + if (SCR::Read (.target.size, flag) != -1) { + y2milestone ("Emergency exit"); + SCR::Execute (.target.remove, flag); + break; + } + } + + if (! running) { + break; + } + // time-out if (time_spent >= script_time_out) { - y2error("Command '%1' timed-out after %2 mces", run_command, time_spent); - cont_loop = false; + y2error("Command timed out after %1 msec", time_spent); + timed_out = true; } time_spent = time_spent + sleep_step; @@ -730,7 +746,7 @@ y2milestone("Time spent: %1 msec", time_spent); // fetching the return code if not timed-out - if (cont_loop) { + if (! timed_out) { script_out = (list<string>) SCR::Read(.background.newout); script_err = (list<string>) SCR::Read(.background.newerr); return_code = (integer) SCR::Read(.background.status); @@ -754,8 +770,8 @@ * @param seconds timeout * @return map with out, err and ret_code */ - map RunDumbTimeout (string command, integer seconds) { - map ret = RunCommandWithTimeout ("TERM=dumb; " + command + "; exit $?", 120); + global map RunDumbTimeout (string command, integer seconds) { + map ret = RunCommandWithTimeout ("TERM=dumb; " + command + "; exit $?", seconds); if (ret == nil) ret = $[]; return ret; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...