Hello community,
here is the log from the commit of package yast2-packager
checked in at Tue Feb 6 19:23:12 CET 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-02-05 09:27:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-02-06 11:33:21.719793000 +0100
@@ -1,0 +2,9 @@
+Tue Feb 6 07:17:33 CET 2007 - lslezak@suse.cz
+
+- inst_source - display the alias in the overview if the product
+ is not known (#241032)
+- callbacks - close download popup and source progress popup if
+ an error occurrs (#216950)
+- 2.15.8
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.7.tar.bz2
New:
----
yast2-packager-2.15.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.L10666/_old 2007-02-06 19:22:59.000000000 +0100
+++ /var/tmp/diff_new_pack.L10666/_new 2007-02-06 19:22:59.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.7)
+# spec file for package yast2-packager (Version 2.15.8)
#
# Copyright (c) 2007 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.15.7
+Version: 2.15.8
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.7.tar.bz2
+Source0: yast2-packager-2.15.8.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-slp yast2-testsuite yast2-xml
Requires: yast2-country
@@ -46,7 +46,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.15.7
+%setup -n yast2-packager-2.15.8
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +84,12 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Tue Feb 06 2007 - lslezak@suse.cz
+- inst_source - display the alias in the overview if the product
+ is not known (#241032)
+- callbacks - close download popup and source progress popup if
+ an error occurrs (#216950)
+- 2.15.8
* Mon Feb 05 2007 - lslezak@suse.cz
- dirinstall - properly initialize Slideshow module, supress
an invalid warning during initialization (#187352)
++++++ yast2-packager-2.15.7.tar.bz2 -> yast2-packager-2.15.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.7/configure new/yast2-packager-2.15.8/configure
--- old/yast2-packager-2.15.7/configure 2007-02-05 09:15:05.000000000 +0100
+++ new/yast2-packager-2.15.8/configure 2007-02-06 07:26:35.000000000 +0100
@@ -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.15.7.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.8.
#
# 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.15.7'
-PACKAGE_STRING='yast2-packager 2.15.7'
+PACKAGE_VERSION='2.15.8'
+PACKAGE_STRING='yast2-packager 2.15.8'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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.15.7 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.15.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.15.7:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.15.8:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.15.7
+yast2-packager configure 2.15.8
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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.15.7, which was
+It was created by yast2-packager $as_me 2.15.8, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.15.7'
+ VERSION='2.15.8'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.7"
+VERSION="2.15.8"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3260,7 +3260,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.15.7, which was
+This file was extended by yast2-packager $as_me 2.15.8, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3303,7 +3303,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.15.7
+yast2-packager config.status 2.15.8
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.15.7/configure.in new/yast2-packager-2.15.8/configure.in
--- old/yast2-packager-2.15.7/configure.in 2007-02-05 09:14:59.000000000 +0100
+++ new/yast2-packager-2.15.8/configure.in 2007-02-06 07:26:29.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.15.7, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.8, 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.15.7"
+VERSION="2.15.8"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.7/src/clients/inst_source.ycp new/yast2-packager-2.15.8/src/clients/inst_source.ycp
--- old/yast2-packager-2.15.7/src/clients/inst_source.ycp 2007-02-02 16:27:43.000000000 +0100
+++ new/yast2-packager-2.15.8/src/clients/inst_source.ycp 2007-02-05 12:39:52.000000000 +0100
@@ -82,7 +82,7 @@
source[ "enabled" ]:true ? _("On") : _("Off"),
source["autorefresh"]:true ? _("On") : _("Off"),
// translators: unknown name for a given source
- productData[ "label" ]:generalData[ "type" ]: _("unknown"),
+ productData[ "label" ]:generalData["alias"]:generalData[ "type" ]: _("unknown"),
generalData[ "url" ]:""
);
return item;
@@ -280,7 +280,7 @@
}
}
else {
- y2milestone ("No rug, not syncing");
+ y2milestone ("No rug or ZMD sync disabled - not syncing");
}
foreach( integer id, sourcesToDelete, ``{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.7/src/modules/PackageCallbacks.ycp new/yast2-packager-2.15.8/src/modules/PackageCallbacks.ycp
--- old/yast2-packager-2.15.7/src/modules/PackageCallbacks.ycp 2007-01-25 15:49:20.000000000 +0100
+++ new/yast2-packager-2.15.8/src/modules/PackageCallbacks.ycp 2007-02-05 16:34:12.000000000 +0100
@@ -90,6 +90,11 @@
CommandLine::PrintVerbose(sformat(_("Downloading package %1 (%2)..."), name, sz));
}
else {
+ if (_provide_popup)
+ {
+ UI::CloseDialog();
+ }
+
// popup heading
term providebox = ProgressBox (_("Downloading Package"), name, sz);
UI::OpenDialog(providebox);
@@ -176,7 +181,10 @@
{
y2milestone("DoneProvide: %1", error);
if (_provide_popup)
+ {
UI::CloseDialog();
+ _provide_popup = false;
+ }
if (Mode::commandline())
{
@@ -189,7 +197,6 @@
provide_aborted = false;
return "CANCEL";
}
- _provide_popup = false;
if (error != 0)
{
@@ -715,6 +722,12 @@
UI::CloseDialog();
+ if (_provide_popup)
+ {
+ UI::CloseDialog();
+ _provide_popup = false;
+ }
+
if (!Mode::normal ())
{
import "SlideShow";
@@ -784,7 +797,7 @@
UI::OpenDialog(
`VBox(
`HSpacing(max_size),
- `Heading(`id(`label), `opt(`hstretch), display),
+ `Heading(`id(`label_source_popup), `opt(`hstretch), display),
`ProgressBar (`id (`progress), " ", 100, 0)
)
);
@@ -820,8 +833,21 @@
return true;
}
+// is the top level window source popup?
+boolean IsSourcePopup()
+{
+ return UI::WidgetExists(`id(`progress)) &&
+ UI::WidgetExists(`id(`label_source_popup));
+}
+
void CloseSourcePopup()
{
+ if (!IsSourcePopup())
+ {
+ y2error("The toplevel dialog is not a source popup dialog!");
+ return;
+ }
+
_source_open = _source_open - 1;
// set 100% progress
@@ -835,6 +861,25 @@
y2milestone("CloseSourcePopup: _source_open: %1", _source_open);
}
+// completely close the source popup window (all instances)
+// should be called if an error occurrs
+void CloseSourcePopupAll()
+{
+ if (!IsSourcePopup())
+ {
+ y2error("The toplevel dialog is not a source popup dialog!");
+ return;
+ }
+
+ _source_open = 0;
+
+ // set 100% progress
+ SourcePopupSetProgress(100);
+
+ y2milestone("Closing source progress popup - all instances");
+ UI::CloseDialog();
+}
+
global void SourceCreateStart(string url) {
y2milestone ("SourceCreateStart: %1", url);
@@ -912,13 +957,7 @@
UI::CloseDialog ();
y2milestone ("Source create 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();
- }
+ CloseSourcePopupAll();
return ret;
}
@@ -1109,13 +1148,7 @@
UI::CloseDialog ();
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();
- }
+ CloseSourcePopupAll();
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.7/VERSION new/yast2-packager-2.15.8/VERSION
--- old/yast2-packager-2.15.7/VERSION 2007-02-05 09:14:54.000000000 +0100
+++ new/yast2-packager-2.15.8/VERSION 2007-02-06 07:18:05.000000000 +0100
@@ -1 +1 @@
-2.15.7
+2.15.8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org