Hello community,
here is the log from the commit of package yast2-packager
checked in at Tue Apr 3 20:40:24 CEST 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-03-28 17:07:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-04-02 14:43:06.000000000 +0200
@@ -1,0 +2,22 @@
+Mon Apr 2 14:40:41 CEST 2007 - locilka@suse.cz
+
+- Making SLP Catalog Details wider and higher. The exact dialog
+ size depends on selected UI and ammount of information presented
+ in table (#237337).
+- 2.15.28
+
+-------------------------------------------------------------------
+Mon Apr 2 14:31:04 CEST 2007 - lslezak@suse.cz
+
+- Pkg::CallbackSourceCreateInit/Destroy() and
+ Pkg::CallbackSourceReportInit() handlers (#251726)
+- 2.15.27
+
+-------------------------------------------------------------------
+Fri Mar 30 13:40:51 CEST 2007 - locilka@suse.cz
+
+- Added global variable into AddOnProduct that informs installation
+ whether low-memory issue has been already reported or not
+ (bugzilla #239630).
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.26.tar.bz2
New:
----
yast2-packager-2.15.28.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.O16833/_old 2007-04-03 20:39:51.000000000 +0200
+++ /var/tmp/diff_new_pack.O16833/_new 2007-04-03 20:39:51.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.26)
+# spec file for package yast2-packager (Version 2.15.28)
#
# 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.26
+Version: 2.15.28
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.26.tar.bz2
+Source0: yast2-packager-2.15.28.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
BuildRequires: yast2 >= 2.15.22
@@ -49,7 +49,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.15.26
+%setup -n yast2-packager-2.15.28
%build
%{prefix}/bin/y2tool y2autoconf
@@ -88,6 +88,19 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Mon Apr 02 2007 - locilka@suse.cz
+- Making SLP Catalog Details wider and higher. The exact dialog
+ size depends on selected UI and ammount of information presented
+ in table (#237337).
+- 2.15.28
+* Mon Apr 02 2007 - lslezak@suse.cz
+- Pkg::CallbackSourceCreateInit/Destroy() and
+ Pkg::CallbackSourceReportInit() handlers (#251726)
+- 2.15.27
+* Fri Mar 30 2007 - locilka@suse.cz
+- Added global variable into AddOnProduct that informs installation
+ whether low-memory issue has been already reported or not
+ (bugzilla #239630).
* Wed Mar 28 2007 - locilka@suse.cz
- Moved some testsuites from yast2-packager to yast2
- 2.15.26
++++++ yast2-packager-2.15.26.tar.bz2 -> yast2-packager-2.15.28.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.26/configure new/yast2-packager-2.15.28/configure
--- old/yast2-packager-2.15.26/configure 2007-03-28 16:36:30.000000000 +0200
+++ new/yast2-packager-2.15.28/configure 2007-04-02 15:06:06.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.15.25.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.28.
#
# 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.25'
-PACKAGE_STRING='yast2-packager 2.15.25'
+PACKAGE_VERSION='2.15.28'
+PACKAGE_STRING='yast2-packager 2.15.28'
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.25 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.15.28 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.25:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.15.28:";;
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.25
+yast2-packager configure 2.15.28
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.25, which was
+It was created by yast2-packager $as_me 2.15.28, 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.25'
+ VERSION='2.15.28'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.25"
+VERSION="2.15.28"
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.25, which was
+This file was extended by yast2-packager $as_me 2.15.28, 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.25
+yast2-packager config.status 2.15.28
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.26/configure.in new/yast2-packager-2.15.28/configure.in
--- old/yast2-packager-2.15.26/configure.in 2007-03-28 16:36:23.000000000 +0200
+++ new/yast2-packager-2.15.28/configure.in 2007-04-02 15:06:01.000000000 +0200
@@ -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.25, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.28, 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.25"
+VERSION="2.15.28"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.26/src/modules/AddOnProduct.ycp new/yast2-packager-2.15.28/src/modules/AddOnProduct.ycp
--- old/yast2-packager-2.15.26/src/modules/AddOnProduct.ycp 2007-03-28 09:05:42.000000000 +0200
+++ new/yast2-packager-2.15.28/src/modules/AddOnProduct.ycp 2007-03-30 13:35:40.000000000 +0200
@@ -82,6 +82,10 @@
global list <integer> mode_config_sources = [];
+// Bugzilla #239630
+// In installation: check for low-memory machines
+global boolean low_memory_already_reported = false;
+
/**
* Adapts the inst-sys from the tarball
* @param filename string the filename with the tarball to use to the update
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.26/src/modules/PackageCallbacks.ycp new/yast2-packager-2.15.28/src/modules/PackageCallbacks.ycp
--- old/yast2-packager-2.15.26/src/modules/PackageCallbacks.ycp 2007-02-26 09:30:10.000000000 +0100
+++ new/yast2-packager-2.15.28/src/modules/PackageCallbacks.ycp 2007-04-02 14:40:07.000000000 +0200
@@ -7,7 +7,7 @@
*
* Purpose: provides the default Callbacks for Pkg::
*
- * $Id: PackageCallbacks.ycp 36354 2007-02-21 16:01:56Z lslezak $
+ * $Id: PackageCallbacks.ycp 37257 2007-04-02 12:32:45Z lslezak $
*
*/
@@ -52,6 +52,9 @@
string back_string = "\b\b\b\b\b\b\b\b\b\b";
string clear_string = back_string + " " + back_string;
+ // max. length of the text in the source popup window
+ integer max_size = 60;
+
//--------------------------------------------------------------------------
// defaults
@@ -827,84 +830,50 @@
return ret;
}
-void OpenSourcePopup(string text)
+void OpenSourcePopup()
{
- integer max_size = 60;
-
if (_source_open == 0)
{
- // the popup doesn't exist
- y2milestone("Opening source progress popup: %1", text);
-
- // if the text is too long then display only part of the message
- // and then refresh the label to the full string
- // reason: display a small popup, but user can resize it to see
- // the full message
- string display = text;
- boolean refresh_label = false;
-
- // Qt UI uses bold font, the string must be shortened even more
- integer ui_adjustment = UI::GetDisplayInfo()["TextMode"]:false ? 0 : 5;
-
- if (size(display) > max_size - ui_adjustment)
- {
- display = ProcessMessage(display, max_size - ui_adjustment);
- }
-
- // truncate long text
- if (size(display) > max_size - ui_adjustment)
- {
- // ellipsis appended to a truncated text (if it's too long)
- string ellipsis = _("...");
- display = substring(display, 0, max_size - ui_adjustment - 1 - size(ellipsis)) + ellipsis;
- refresh_label = true;
- }
-
UI::OpenDialog(
`VBox(
`HSpacing(max_size),
- `Heading(`id(`label_source_popup), `opt(`hstretch), display),
+ `Heading(`id(`label_source_popup), `opt(`hstretch), " "),
`ProgressBar (`id (`progress), " ", 100, 0)
)
);
-
- // set the full text if needed
- if (refresh_label)
- {
- UI::ChangeWidget(`label, `Value, text);
- }
}
- else
- {
- // Qt uses proportional font, the string might be longer
- integer ui_adjustment = UI::GetDisplayInfo()["TextMode"]:false ? 0 : 6;
- if (size(text) > max_size + ui_adjustment)
- {
- text = ProcessMessage(text, max_size + ui_adjustment);
- }
+ _source_open = _source_open + 1;
+ y2milestone("OpenSourcePopup: _source_open: %1", _source_open);
+}
+
+void SetHeaderSourcePopup(string text)
+{
+ // Qt UI uses bold font, the string must be shortened even more
+ integer ui_adjustment = UI::GetDisplayInfo()["TextMode"]:false ? 0 : 5;
- // refresh the labels in the popup
- UI::ChangeWidget(`progress, `Label, text);
- // reset the progressbar
- UI::ChangeWidget(`progress, `Value, 0);
- y2milestone("OpenSourcePopup: new label: %1", text);
+ if (size(text) > max_size - ui_adjustment)
+ {
+ text = ProcessMessage(text, max_size - ui_adjustment);
}
- _source_open = _source_open + 1;
- y2milestone("OpenSourcePopup: _source_open: %1", _source_open);
+ UI::ChangeWidget(`label_source_popup, `Value, text);
+ y2milestone("SourcePopup: new header: %1", text);
}
-boolean SourcePopupSetProgress(integer value)
+void SetLabelSourcePopup(string text)
{
- if (_source_open > 0)
+ // Qt uses proportional font, the string might be longer
+ integer ui_adjustment = UI::GetDisplayInfo()["TextMode"]:false ? 0 : 6;
+
+ if (size(text) > max_size + ui_adjustment)
{
- UI::ChangeWidget (`id (`progress), `Value, value);
- any input = UI::PollInput ();
- if (input == `abort)
- return false;
+ text = ProcessMessage(text, max_size + ui_adjustment);
}
- return true;
+
+ // refresh the label in the popup
+ UI::ChangeWidget(`progress, `Label, text);
+ y2milestone("SourcePopup: new label: %1", text);
}
// is the top level window source popup?
@@ -914,6 +883,18 @@
UI::WidgetExists(`id(`label_source_popup));
}
+boolean SourcePopupSetProgress(integer value)
+{
+ if (_source_open > 0 && IsSourcePopup())
+ {
+ UI::ChangeWidget (`id (`progress), `Value, value);
+ any input = UI::PollInput ();
+ if (input == `abort)
+ return false;
+ }
+ return true;
+}
+
void CloseSourcePopup()
{
if (!IsSourcePopup())
@@ -924,9 +905,6 @@
_source_open = _source_open - 1;
- // set 100% progress
- SourcePopupSetProgress(100);
-
if (_source_open == 0)
{
y2milestone("Closing source progress popup");
@@ -935,26 +913,23 @@
y2milestone("CloseSourcePopup: _source_open: %1", _source_open);
}
-// completely close the source popup window (all instances)
-// should be called if an error occurrs
-void CloseSourcePopupAll()
+
+global void SourceCreateInit()
{
- if (!IsSourcePopup())
- {
- y2error("The toplevel dialog is not a source popup dialog!");
- return;
- }
+ y2milestone ("SourceCreateInit");
- _source_open = 0;
+ OpenSourcePopup();
+}
- // set 100% progress
- SourcePopupSetProgress(100);
+global void SourceCreateDestroy()
+{
+ y2milestone ("SourceCreateDestroy");
- y2milestone("Closing source progress popup - all instances");
- UI::CloseDialog();
+ CloseSourcePopup();
}
-global void SourceCreateStart(string url) {
+global void SourceCreateStart(string url)
+{
y2milestone ("SourceCreateStart: %1", url);
// popup label (%1 is source URL)
@@ -965,7 +940,16 @@
}
else
{
- OpenSourcePopup(sformat(_("Creating source %1"), url));
+ y2internal("_source_open: %1", _source_open);
+
+ if (_source_open == 1)
+ {
+ SetHeaderSourcePopup(msg);
+ }
+ else
+ {
+ SetLabelSourcePopup(msg);
+ }
}
}
@@ -1031,14 +1015,13 @@
UI::CloseDialog ();
y2milestone ("Source create error: Returning %1", ret);
- CloseSourcePopupAll();
-
return ret;
}
global void SourceCreateEnd(string url, symbol error, string description)
{
- CloseSourcePopup();
+ // set 100% progress
+ SourcePopupSetProgress(100);
y2milestone ("Source create end: error: url: %1, error: %2, description: %3", url, error, description);
}
@@ -1057,8 +1040,18 @@
}
else
{
- OpenSourcePopup(_("Probing source..."));
- OpenSourcePopup(sformat(_("Probing source %1"), url));
+ OpenSourcePopup();
+
+ string msg = sformat(_("Probing source %1"), url);
+
+ if (_source_open == 1)
+ {
+ SetHeaderSourcePopup(msg);
+ }
+ else
+ {
+ SetLabelSourcePopup(msg);
+ }
}
}
@@ -1157,7 +1150,16 @@
}
else
{
- OpenSourcePopup(task);
+ y2internal("_source_open: %1", _source_open);
+
+ if (_source_open == 1)
+ {
+ SetHeaderSourcePopup(task);
+ }
+ else
+ {
+ SetLabelSourcePopup(task);
+ }
}
}
@@ -1222,16 +1224,27 @@
UI::CloseDialog ();
y2milestone ("Source report error: Returning %1", ret);
- CloseSourcePopupAll();
-
return ret;
}
global void SourceReportEnd(integer src_id, string url, string task, symbol error, string description)
{
- CloseSourcePopup();
-
y2milestone ("Source report end: src: %1, url: %2, task: %3, error: %4, description: %5", src_id, url, task, error, description);
+
+ // set 100% progress
+ SourcePopupSetProgress(100);
+}
+
+global void SourceReportInit()
+{
+ y2milestone("Source report init");
+ OpenSourcePopup();
+}
+
+global void SourceReportDestroy()
+{
+ y2milestone("Source report destroy");
+ CloseSourcePopup();
}
/** at start of delta providal
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.26/src/modules/SourceManagerSLP.ycp new/yast2-packager-2.15.28/src/modules/SourceManagerSLP.ycp
--- old/yast2-packager-2.15.26/src/modules/SourceManagerSLP.ycp 2007-02-19 15:23:19.000000000 +0100
+++ new/yast2-packager-2.15.28/src/modules/SourceManagerSLP.ycp 2007-04-02 14:40:00.000000000 +0200
@@ -162,16 +162,52 @@
// message popup
Report::Message(_("No details are available."));
} else {
+ // maximal size allowed by UI (with a fallback)
+ map display_information = UI::GetDisplayInfo();
+ integer max_width = display_information["Width"]:1200;
+ integer max_heigth = display_information["Height"]:500;
+ // Graphical UI returns 1280x1024, textmode 80x25
+ if (! display_information["TextMode"]:false) {
+ max_width = max_width / 15;
+ max_heigth = max_heigth / 18;
+ }
+
+ // maximal length of key and val found
+ integer max_len_key = 0;
+ integer max_len_val = 0;
+
list <term> details = [];
+ integer curr_len_key = 0;
+ integer curr_len_val = 0;
+
foreach (any key, any value, service_details, {
- details = add (details, `item (`id(nil), tostring (key), tostring (value)));
+ details = add (details, `item (`id (nil), tostring (key), tostring (value)));
+ curr_len_key = size (tostring (key));
+ curr_len_val = size (tostring (value));
+
+ if (curr_len_key != nil && curr_len_key > max_len_key) max_len_key = curr_len_key;
+ if (curr_len_val != nil && curr_len_val > max_len_val) max_len_val = curr_len_val;
});
+ // maximal key + maximal val (presented in table)
+ integer max_len_total = max_len_key + max_len_val;
+
+ // min X in UI
+ integer min_size_x = max_len_total;
+ if (min_size_x > max_width) min_size_x = max_width;
+ if (min_size_x < 60) min_size_x = 60;
+
+ // min Y in UI
+ integer min_size_y = size (details) + 4;
+ if (min_size_y > max_heigth) min_size_y = max_heigth;
+ if (min_size_y < 14) min_size_y = 14;
+
+ y2milestone ("Details min size: %1 x %2", min_size_x, min_size_y);
UI::OpenDialog (
`VBox (
`Left (`Heading(`id(`details_heading), _("Catalog Details"))),
`MinSize (
- 60, 16,
+ min_size_x, min_size_y,
`Table (
`header(
// table header item
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.26/VERSION new/yast2-packager-2.15.28/VERSION
--- old/yast2-packager-2.15.26/VERSION 2007-03-28 17:07:24.000000000 +0200
+++ new/yast2-packager-2.15.28/VERSION 2007-04-02 14:43:21.000000000 +0200
@@ -1 +1 @@
-2.15.26
+2.15.28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org