Hello community,
here is the log from the commit of package yast2-packager
checked in at Tue Jun 6 12:56:32 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-06-02 16:30:31.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-06-06 11:21:40.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Jun 6 11:21:30 CEST 2006 - mvidner@suse.cz
+
+- Source synchronization: call rug with --quiet (#179080).
+ Enable aborting the sync. Increase logging.
+- 2.13.127
+
+-------------------------------------------------------------------
+Mon Jun 5 14:04:54 CEST 2006 - jsrain@suse.cz
+
+- do not call Pkg::PkgCommit (9999) in first stage (#181195)
+- 2.13.126
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.125.tar.bz2
New:
----
yast2-packager-2.13.127.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.Q5Y0NV/_old 2006-06-06 12:56:01.000000000 +0200
+++ /var/tmp/diff_new_pack.Q5Y0NV/_new 2006-06-06 12:56:01.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.125)
+# spec file for package yast2-packager (Version 2.13.127)
#
# 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.125
+Version: 2.13.127
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.125.tar.bz2
+Source0: yast2-packager-2.13.127.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
@@ -43,7 +43,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.13.125
+%setup -n yast2-packager-2.13.127
%build
%{prefix}/bin/y2tool y2autoconf
@@ -80,6 +80,13 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Tue Jun 06 2006 - mvidner@suse.cz
+- Source synchronization: call rug with --quiet (#179080).
+ Enable aborting the sync. Increase logging.
+- 2.13.127
+* Mon Jun 05 2006 - jsrain@suse.cz
+- do not call Pkg::PkgCommit (9999) in first stage (#181195)
+- 2.13.126
* Fri Jun 02 2006 - lslezak@suse.cz
- run the solver after selecting a Xen kernel (#178306)
- fixes in SourceManager module (nil check, infinite loops)
++++++ yast2-packager-2.13.125.tar.bz2 -> yast2-packager-2.13.127.tar.bz2 ++++++
++++ 2724 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.125/VERSION new/yast2-packager-2.13.127/VERSION
--- old/yast2-packager-2.13.125/VERSION 2006-06-02 16:12:15.000000000 +0200
+++ new/yast2-packager-2.13.127/VERSION 2006-06-06 11:19:27.000000000 +0200
@@ -1 +1 @@
-2.13.125
+2.13.127
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.125/configure.in new/yast2-packager-2.13.127/configure.in
--- old/yast2-packager-2.13.125/configure.in 2006-06-02 16:29:06.000000000 +0200
+++ new/yast2-packager-2.13.127/configure.in 2006-06-06 11:22:15.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
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-packager, 2.13.125, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.13.127, http://bugs.opensuse.org/, 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.125"
+VERSION="2.13.127"
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.125/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.13.127/src/clients/inst_rpmcopy.ycp
--- old/yast2-packager-2.13.125/src/clients/inst_rpmcopy.ycp 2006-05-10 09:31:16.000000000 +0200
+++ new/yast2-packager-2.13.127/src/clients/inst_rpmcopy.ycp 2006-06-06 11:19:04.000000000 +0200
@@ -13,7 +13,7 @@
* Packages module :
* "installed"
*
- * $Id: inst_rpmcopy.ycp 30678 2006-05-04 11:06:58Z locilka $
+ * $Id: inst_rpmcopy.ycp 31312 2006-06-05 12:05:19Z jsrain $
*/
{
@@ -804,9 +804,9 @@
symbol result = InstallPackagesFromMedia (current_cd_no, maxnumbercds);
// sync package manager FIXME
- if (result != `abort)
+ if (result != `abort && ! Stage::initial ())
{
- y2milestone ("Calling PkgCommig (%1)", 9999);
+ y2milestone ("Calling PkgCommit (%1)", 9999);
Pkg::PkgCommit (9999);
}
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.125/src/modules/PackageInstallation.ycp new/yast2-packager-2.13.127/src/modules/PackageInstallation.ycp
--- old/yast2-packager-2.13.125/src/modules/PackageInstallation.ycp 2006-05-10 09:31:16.000000000 +0200
+++ new/yast2-packager-2.13.127/src/modules/PackageInstallation.ycp 2006-06-06 11:19:04.000000000 +0200
@@ -144,7 +144,7 @@
if (do_commit)
{
// returns [ int successful, list failed, list remaining, list srcremaining ]
- y2milestone ("Calling PkgCommig (%1)", media_number);
+ y2milestone ("Calling PkgCommit (%1)", media_number);
commit_result = Pkg::PkgCommit (media_number);
SlideShow::StopTimer();
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.125/src/modules/SourceManager.ycp new/yast2-packager-2.13.127/src/modules/SourceManager.ycp
--- old/yast2-packager-2.13.125/src/modules/SourceManager.ycp 2006-06-02 16:18:48.000000000 +0200
+++ new/yast2-packager-2.13.127/src/modules/SourceManager.ycp 2006-06-06 11:21:50.000000000 +0200
@@ -7,7 +7,7 @@
* Martin Vidner
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 31293 2006-06-02 14:18:41Z lslezak $
+ * $Id: SourceManager.ycp 31323 2006-06-06 09:21:42Z mvidner $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -744,6 +744,19 @@
break;
}
+ // at last, enable aborting the sync
+ if (Mode::commandline ()) {
+ sleep (sleep_step);
+ }
+ else {
+ any ui = UI::TimeoutUserInput (sleep_step);
+ if (ui == `abort) {
+ y2milestone ("aborted");
+ timed_out = true;
+ break;
+ }
+ }
+
// time-out
if (time_spent >= script_time_out) {
y2error("Command timed out after %1 msec", time_spent);
@@ -751,16 +764,19 @@
}
time_spent = time_spent + sleep_step;
- sleep(sleep_step);
}
y2milestone("Time spent: %1 msec", time_spent);
// fetching the return code if not timed-out
if (! timed_out) {
+ y2milestone ("getting output");
script_out = (list<string>) SCR::Read(.background.newout);
+ y2milestone ("getting errors");
script_err = (list<string>) SCR::Read(.background.newerr);
+ y2milestone ("getting status");
return_code = (integer) SCR::Read(.background.status);
}
+ y2milestone ("killing");
SCR::Execute(.background.kill, "");
map command_ret = $[
@@ -790,16 +806,7 @@
}
/**
- * Run with a short timeout
- * @param command a command
- * @return map with out, err and ret_code
- */
- map RunShort (string command) {
- return RunDumbTimeout (command, 120);
- }
-
- /**
- * Run with a short timeout
+ * Run with a long timeout
* @param command a command
* @return map with out, err and ret_code
*/
@@ -914,14 +921,15 @@
string owner = "zypp"; // not stype: #168739
string command = nil;
+ // be quiet, #179080
if (adding) {
command = sformat (
- "/usr/bin/rug service-add --type='%3' '%1' '%2' && /usr/bin/rug subscribe '%1'",
+ "/usr/bin/rug --quiet service-add --type='%3' '%1' '%2' && /usr/bin/rug subscribe '%1'",
url, name, owner
);
}
else {
- command = sformat ("/usr/bin/rug service-delete '%1'", url);
+ command = sformat ("/usr/bin/rug --quiet service-delete '%1'", url);
}
map ret = RunLong (command); // #165145
if (ret["exit"]:nil == 0) {
@@ -1015,7 +1023,7 @@
SCR::Write (.target.string, source_lock_flag, "bug 170113");
}
source_locked = source_locked + 1;
- y2milestone ("%1", source_locked);
+ y2milestone ("lock: %1", source_locked);
}
/**
@@ -1032,7 +1040,7 @@
{
SCR::Execute (.target.remove, source_lock_flag);
}
- y2milestone ("%1", source_locked);
+ y2milestone ("unlock: %1", source_locked);
}
@@ -1055,8 +1063,11 @@
// the RPM database. You can run it only when the RPM is not locked
// otherwise the ZMD will block itself!
- // popup progress information
- UI::OpenDialog (`Label(_("Initializing catalogs...")));
+ UI::OpenDialog (`VBox (
+ // popup progress information
+ `Label(_("Initializing catalogs...")),
+ `PushButton (`id (`abort), Label::AbortButton ())
+ ));
y2milestone("--- Syncing YaST inst source with ZMD ---");
Lock ();
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.125/src/modules/test.ycp new/yast2-packager-2.13.127/src/modules/test.ycp
--- old/yast2-packager-2.13.125/src/modules/test.ycp 2005-11-02 13:29:02.000000000 +0100
+++ new/yast2-packager-2.13.127/src/modules/test.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-
-{
- import "Package";
- import "CommandLine";
-
- textdomain "test";
-
- boolean startHandler(map opts) {
- Package::InstallAll(["samba-doc", "qt3-devel-doc"]);
-// Package::InstallAll(["sambadocdfdfdf"]);
-
- return true;
- }
-
- symbol GUIhandler() {
- y2milestone("GUIhandler");
- return `next;
- }
-
- boolean Read() {
- return true;
- }
-
- boolean Write() {
- return true;
- }
-
- map cmdline = $[
- // help text
- "help" : _("Start installation in a virtual machine"),
- "id" : "vm",
- "guihandler": GUIhandler,
- "initialize": Read,
- "finish" : Write,
- "actions" : $[
- "start" : $[
- // command description
- "help" : _("Start installation"),
- "handler" : startHandler
- ]
- ],
- "options" : $[
- "configured" : $[
- // option description
- "help" : _("List only configured devices")
- ],
- "all" : $[
- // option description
- "help" : _("List all detected IDE devices")
- ]
- ],
- "mappings" : $[
- "start" : ["configured", "all"],
- ]
- ];
-
- any ret = CommandLine::Run(cmdline);
-}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org