Mailinglist Archive: opensuse-commit (1262 mails)

< Previous Next >
commit yast2-packager
  • From: root@xxxxxxx (h_root)
  • Date: Fri, 22 Sep 2006 16:28:38 +0200 (CEST)
  • Message-id: <20060922142838.024D718F037@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-packager
checked in at Fri Sep 22 16:28:38 CEST 2006.

--------
--- yast2-packager/yast2-packager.changes 2006-09-20 12:50:10.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-09-22 14:07:41.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Sep 22 13:35:56 CEST 2006 - lslezak@xxxxxxx
+
+- callback handler - close the error popup window (#206953)
+- reinitialize the package manager after installation
+ (temporary workaround for #201121, #202088)
+- 2.13.151
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.fDVEQM/_old 2006-09-22 16:28:19.000000000 +0200
+++ /var/tmp/diff_new_pack.fDVEQM/_new 2006-09-22 16:28:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.150)
+# spec file for package yast2-packager (Version 2.13.151)
#
# 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.150
+Version: 2.13.151
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.150.tar.bz2
+Source0: yast2-packager-2.13.151.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-firewall yast2-installation yast2-slp yast2-testsuite yast2-xml
Requires: checkmedia yast2-country
@@ -47,7 +47,7 @@
Arvin Schnell <arvin@xxxxxxx>

%prep
-%setup -n yast2-packager-2.13.150
+%setup -n yast2-packager-2.13.151

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

%changelog -n yast2-packager
+* Fri Sep 22 2006 - lslezak@xxxxxxx
+- callback handler - close the error popup window (#206953)
+- reinitialize the package manager after installation
+ (temporary workaround for #201121, #202088)
+- 2.13.151
* Wed Sep 20 2006 - lslezak@xxxxxxx
- checkmedia - show output in a richtext widget, fixed labels
(feature #422), adapted to chages in 'checkmedia' output

++++++ yast2-packager-2.13.150.tar.bz2 -> yast2-packager-2.13.151.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.150/VERSION new/yast2-packager-2.13.151/VERSION
--- old/yast2-packager-2.13.150/VERSION 2006-09-20 11:05:13.000000000 +0200
+++ new/yast2-packager-2.13.151/VERSION 2006-09-22 13:49:17.000000000 +0200
@@ -1 +1 @@
-2.13.150
+2.13.151
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.150/configure new/yast2-packager-2.13.151/configure
--- old/yast2-packager-2.13.150/configure 2006-09-20 12:40:22.000000000 +0200
+++ new/yast2-packager-2.13.151/configure 2006-09-22 13:51:13.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-packager 2.13.150.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.13.151.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.13.150'
-PACKAGE_STRING='yast2-packager 2.13.150'
+PACKAGE_VERSION='2.13.151'
+PACKAGE_STRING='yast2-packager 2.13.151'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'

ac_unique_file="RPMNAME"
@@ -1180,7 +1180,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-packager 2.13.150 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.13.151 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1251,7 +1251,7 @@

if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.13.150:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.13.151:";;
esac
cat <<\_ACEOF

@@ -1329,7 +1329,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.13.150
+yast2-packager configure 2.13.151
generated by GNU Autoconf 2.60

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1343,7 +1343,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

-It was created by yast2-packager $as_me 2.13.150, which was
+It was created by yast2-packager $as_me 2.13.151, which was
generated by GNU Autoconf 2.60. Invocation command line was

$ $0 $@
@@ -2144,7 +2144,7 @@

# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.13.150'
+ VERSION='2.13.151'


cat >>confdefs.h <<_ACEOF
@@ -2371,7 +2371,7 @@



-VERSION="2.13.150"
+VERSION="2.13.151"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"

@@ -3229,7 +3229,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.13.150, which was
+This file was extended by yast2-packager $as_me 2.13.151, which was
generated by GNU Autoconf 2.60. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
@@ -3272,7 +3272,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.13.150
+yast2-packager config.status 2.13.151
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.150/configure.in new/yast2-packager-2.13.151/configure.in
--- old/yast2-packager-2.13.150/configure.in 2006-09-20 12:40:16.000000000 +0200
+++ new/yast2-packager-2.13.151/configure.in 2006-09-22 13:51:08.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.22 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-packager, 2.13.150, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.13.151, 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.150"
+VERSION="2.13.151"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.150/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.13.151/src/clients/inst_rpmcopy.ycp
--- old/yast2-packager-2.13.150/src/clients/inst_rpmcopy.ycp 2006-09-04 16:11:39.000000000 +0200
+++ new/yast2-packager-2.13.151/src/clients/inst_rpmcopy.ycp 2006-09-22 14:05:08.000000000 +0200
@@ -13,7 +13,7 @@
* Packages module :
* "installed"
*
- * $Id: inst_rpmcopy.ycp 32691 2006-09-04 14:13:07Z lslezak $
+ * $Id: inst_rpmcopy.ycp 33055 2006-09-22 12:06:45Z lslezak $
*/

{
@@ -831,6 +831,13 @@
Pkg::PkgCommit (9999);
}

+// TODO FIXME: workaround for #201121 (#202088)
+// reinitialize the package manager from the target
+Pkg::TargetFinish();
+Pkg::TargetInitialize(Installation::destdir);
+Pkg::TargetLoad();
+
+
SlideShow::CloseSlideShowDialog();

if (result != `abort)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.150/src/clients/sw_single.ycp new/yast2-packager-2.13.151/src/clients/sw_single.ycp
--- old/yast2-packager-2.13.150/src/clients/sw_single.ycp 2006-09-18 16:16:32.000000000 +0200
+++ new/yast2-packager-2.13.151/src/clients/sw_single.ycp 2006-09-22 14:05:08.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 32942 2006-09-18 14:18:45Z lslezak $
+ * $Id: sw_single.ycp 33055 2006-09-22 12:06:45Z lslezak $
*/

{
@@ -221,6 +221,16 @@

do
{
+// the user has restarted the software selection
+// TODO FIXME: workaround for #201121 (#202088)
+// reinitialize the package manager from the target
+if (ask)
+{
+ Pkg::TargetFinish();
+ Pkg::TargetInitialize(Installation::destdir);
+ Pkg::TargetLoad();
+}
+
list<string> old_failed_packs = [];
if ((integer)SCR::Read (.target.size,
"/var/lib/YaST2/failed_packages") > 0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.150/src/modules/PackageCallbacks.ycp new/yast2-packager-2.13.151/src/modules/PackageCallbacks.ycp
--- old/yast2-packager-2.13.150/src/modules/PackageCallbacks.ycp 2006-09-18 13:35:19.000000000 +0200
+++ new/yast2-packager-2.13.151/src/modules/PackageCallbacks.ycp 2006-09-22 10:52:21.000000000 +0200
@@ -232,7 +232,7 @@
if ( showLongInfo )
{
UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 10, true) );
- UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), sformat ("Err: %1:", error) + reason) );
+ UI::ReplaceWidget(`id(`info), `RichText (`opt(`plainText), sformat (_("Error: %1:"), error) + reason) );
}
else
{
@@ -252,7 +252,7 @@
{
UI::ReplaceWidget(`id(`info),
`RichText (`opt(`plainText),
- sformat ("Err: %1:", error) + reason) );
+ sformat (_("Error: %1:"), error) + reason) );
}
else
{
@@ -757,6 +757,7 @@
}

_source_open = _source_open + 1;
+ y2internal("OpenSourcePopup: new _source_open: %1", _source_open);
}

boolean SourcePopupSetProgress(integer value)
@@ -783,6 +784,7 @@
y2internal("Closing source progress popup");
UI::CloseDialog();
}
+ y2internal("CloseSourcePopup: new _source_open: %1", _source_open);
}

global void SourceCreateStart(string url) {
@@ -858,14 +860,15 @@
symbol ret = (symbol)UI::UserInput ();
UI::CloseDialog ();
y2milestone ("Source create error: Returning %1", ret);
-/*
- // close the popup if the operation is aborted
- if (ret == `ABORT)
+
+ if (ret == `RETRY)
{
- _source_open = 0;
+ // The start callback will be evaluated again,
+ // but the end callback will be called just once.
+ // This call replaces the missing end callback.
CloseSourcePopup();
}
-*/
+
return ret;
}

@@ -1001,7 +1004,7 @@


global symbol SourceReportError(integer source_id, string url, symbol error, string description) {
- y2milestone ("Source probe: error: id: %1, url: %2, error: %3, description: %4", source_id, url, error, description);
+ y2milestone ("Source report: error: id: %1, url: %2, error: %3, description: %4", source_id, url, error, description);

// error message - a label followed by a richtext with details
string message = sformat(_("Source %1"), url);
@@ -1050,7 +1053,16 @@
));
symbol ret = (symbol)UI::UserInput ();
UI::CloseDialog ();
- y2milestone ("Source probe error: Returning %1", ret);
+ y2milestone ("Source report error: Returning %1", ret);
+
+ if (ret == `RETRY)
+ {
+ // The start callback will be evaluated again,
+ // but the end callback will be called just once.
+ // This call replaces the missing end callback.
+ CloseSourcePopup();
+ }
+
return ret;
}



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



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >