Hello community,
here is the log from the commit of package yast2-packager
checked in at Thu Oct 23 12:37:50 CEST 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-10-15 17:20:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-10-23 09:33:56.538881000 +0200
@@ -1,0 +2,63 @@
+Thu Oct 23 06:01:53 CEST 2008 - lslezak@suse.cz
+
+- properly select kernel packages (bnc#437258)
+- 2.17.34
+
+-------------------------------------------------------------------
+Wed Oct 22 14:39:57 CEST 2008 - lslezak@suse.cz
+
+- install nfs-client instead of portmap when the system is
+ installated from a NFS server (bnc#436897)
+- install xen-tools-domU.rpm instead of xen-tools.rpm in XEN domU
+ (bnc#437335)
+- remove also the repositories which belong to a removed service,
+ update status of the repositories when the service status is
+ changed (bnc#437722)
+- 2.17.33
+
+-------------------------------------------------------------------
+Tue Oct 21 16:54:31 CEST 2008 - kmachalkova@suse.cz
+
+- AddPackageList from Storage is no longer needed - now y2-storage
+ handles package selection in installation by itself (bnc#433001)
+
+-------------------------------------------------------------------
+Tue Oct 21 16:49:06 CEST 2008 - lslezak@suse.cz
+
+- repositories.ycp - pad the priority number with spaces so the
+ sorting by priority works as expected (bnc#404205)
+
+-------------------------------------------------------------------
+Mon Oct 20 18:04:07 CEST 2008 - lslezak@suse.cz
+
+- moved PackagesUI.ycp to yast2 package, use the new API
+ (RunPackageSelector() and RunPatternSelector() functions)
+ (bnc#435479)
+- 2.17.32
+
+-------------------------------------------------------------------
+Mon Oct 20 15:55:06 CEST 2008 - ug@suse.de
+
+- workaround added to get old autoyast behaviour back
+
+-------------------------------------------------------------------
+Mon Oct 20 14:48:52 CEST 2008 - lslezak@suse.cz
+
+- display support status dialog in the package selector widget
+ if it's requested in the control file (bnc#435479)
+- 2.17.31
+
+-------------------------------------------------------------------
+Thu Oct 16 20:01:37 CEST 2008 - mvidner@suse.cz
+
+- Fixed localized sorting to emulate < instead of <=,
+ avoiding a crash (bnc#385172).
+- 2.17.30
+
+-------------------------------------------------------------------
+Thu Oct 16 15:03:10 CEST 2008 - lslezak@suse.cz
+
+- repositories.ycp - display name of the service (instead of alias)
+ to which a repository belongs
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-packager-2.17.29.tar.bz2
New:
----
yast2-packager-2.17.34.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.vd9174/_old 2008-10-23 12:37:21.000000000 +0200
+++ /var/tmp/diff_new_pack.vd9174/_new 2008-10-23 12:37:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.17.29)
+# spec file for package yast2-packager (Version 2.17.34)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,26 +19,26 @@
Name: yast2-packager
-Version: 2.17.29
+Version: 2.17.34
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.17.29.tar.bz2
+Source0: yast2-packager-2.17.34.tar.bz2
Prefix: /usr
BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml
# HTTP.ycp
BuildRequires: yast2-transfer
-# Added PackagesProposal module
-BuildRequires: yast2 >= 2.17.36
+# PackagesUI.ycp
+BuildRequires: yast2 >= 2.17.40
# "order" flag for pattern resolvables
BuildRequires: yast2-pkg-bindings >= 2.17.13
# Newly added RPM
Requires: yast2-country-data >= 2.16.3
# "order" flag for pattern resolvables
Requires: yast2-pkg-bindings >= 2.17.13
-# PackagesProposal with `pattern(s)
-Requires: yast2 >= 2.17.38
+# PackagesUI.ycp
+Requires: yast2 >= 2.17.40
# unzipping license file
Requires: unzip
# HTTP, FTP, HTTPS modules (inst_productsources.ycp)
@@ -78,7 +78,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.17.29
+%setup -n yast2-packager-2.17.34
%build
%{prefix}/bin/y2tool y2autoconf
@@ -114,6 +114,42 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Thu Oct 23 2008 lslezak@suse.cz
+- properly select kernel packages (bnc#437258)
+- 2.17.34
+* Wed Oct 22 2008 lslezak@suse.cz
+- install nfs-client instead of portmap when the system is
+ installated from a NFS server (bnc#436897)
+- install xen-tools-domU.rpm instead of xen-tools.rpm in XEN domU
+ (bnc#437335)
+- remove also the repositories which belong to a removed service,
+ update status of the repositories when the service status is
+ changed (bnc#437722)
+- 2.17.33
+* Tue Oct 21 2008 kmachalkova@suse.cz
+- AddPackageList from Storage is no longer needed - now y2-storage
+ handles package selection in installation by itself (bnc#433001)
+* Tue Oct 21 2008 lslezak@suse.cz
+- repositories.ycp - pad the priority number with spaces so the
+ sorting by priority works as expected (bnc#404205)
+* Mon Oct 20 2008 lslezak@suse.cz
+- moved PackagesUI.ycp to yast2 package, use the new API
+ (RunPackageSelector() and RunPatternSelector() functions)
+ (bnc#435479)
+- 2.17.32
+* Mon Oct 20 2008 ug@suse.de
+- workaround added to get old autoyast behaviour back
+* Mon Oct 20 2008 lslezak@suse.cz
+- display support status dialog in the package selector widget
+ if it's requested in the control file (bnc#435479)
+- 2.17.31
+* Thu Oct 16 2008 mvidner@suse.cz
+- Fixed localized sorting to emulate < instead of <=,
+ avoiding a crash (bnc#385172).
+- 2.17.30
+* Thu Oct 16 2008 lslezak@suse.cz
+- repositories.ycp - display name of the service (instead of alias)
+ to which a repository belongs
* Wed Oct 15 2008 lslezak@suse.cz
- check signatures also when downloading slideshow images
(bnc#409927)
++++++ yast2-packager-2.17.29.tar.bz2 -> yast2-packager-2.17.34.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.29/configure new/yast2-packager-2.17.34/configure
--- old/yast2-packager-2.17.29/configure 2008-10-15 17:18:07.000000000 +0200
+++ new/yast2-packager-2.17.34/configure 2008-10-23 09:29:49.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-packager 2.17.29.
+# Generated by GNU Autoconf 2.61 for yast2-packager 2.17.34.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.17.29'
-PACKAGE_STRING='yast2-packager 2.17.29'
+PACKAGE_VERSION='2.17.34'
+PACKAGE_STRING='yast2-packager 2.17.34'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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.17.29 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.17.34 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.17.29:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.17.34:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.17.29
+yast2-packager configure 2.17.34
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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.17.29, which was
+It was created by yast2-packager $as_me 2.17.34, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.17.29'
+ VERSION='2.17.34'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.29"
+VERSION="2.17.34"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
@@ -3304,7 +3304,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.17.29, which was
+This file was extended by yast2-packager $as_me 2.17.34, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.17.29
+yast2-packager config.status 2.17.34
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.29/configure.in new/yast2-packager-2.17.34/configure.in
--- old/yast2-packager-2.17.29/configure.in 2008-10-15 17:18:02.000000000 +0200
+++ new/yast2-packager-2.17.34/configure.in 2008-10-23 09:29:42.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.17.29, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.17.34, http://bugs.opensuse.org/, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.29"
+VERSION="2.17.34"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.29/src/clients/inst_packages.ycp new/yast2-packager-2.17.34/src/clients/inst_packages.ycp
--- old/yast2-packager-2.17.29/src/clients/inst_packages.ycp 2008-09-10 11:43:59.000000000 +0200
+++ new/yast2-packager-2.17.34/src/clients/inst_packages.ycp 2008-10-21 10:24:12.000000000 +0200
@@ -3,18 +3,16 @@
* Authors: Stefan Hundhammer
* Purpose: Show the package installation dialog
*
- * $Id: inst_packages.ycp 48351 2008-06-17 11:15:06Z lslezak $
+ * $Id: inst_packages.ycp 52381 2008-10-21 08:24:11Z lslezak $
*
*/
{
textdomain "packager";
- import "Mode";
+ import "PackagesUI";
import "Stage";
- import "Wizard";
- import "Label";
-
+ import "Mode";
/**
* Start the detailed package selection. If 'mode' is non-nil, it will be
@@ -22,40 +20,17 @@
*
* Returns `accept or `cancel .
**/
- symbol detailedSelection( symbol mode, boolean enable_repo_mgr )
+ symbol detailedSelection( symbol mode, boolean enable_repo_mgr, boolean display_support_status)
{
- y2milestone("Running detailed selection, mode: %1, display repo management: %2", mode, enable_repo_mgr);
+ map options = $[
+ "mode" : mode,
+ "enable_repo_mgr" : enable_repo_mgr,
+ "display_support_status" : display_support_status
+ ];
- // Open an empty dialog for immediate feedback
- UI::OpenDialog(`opt(`defaultsize),
- `ReplacePoint(`id( `rep),
- `Label( _("Reading package database...") )
- )
- );
-
- // This will take a while: Detailed package data are retrieved
- // while the package manager is initialized
- UI::ReplaceWidget(`rep,
- mode == nil ?
- (enable_repo_mgr ?
- `PackageSelector(`id(`packages), `opt(`repoMgr), "")
- : `PackageSelector(`id(`packages), "")
- ) :
-
- (enable_repo_mgr ?
- `PackageSelector(`id(`packages ), `opt(mode, `repoMgr), "")
- : `PackageSelector(`id(`packages ), `opt(mode), "")
- )
- );
-
- symbol result = (symbol) UI::RunPkgSelection(`id(`packages ) );
- UI::CloseDialog();
- y2milestone( "Package selector returned %1", result );
-
- return result;
+ return PackagesUI::RunPackageSelector(options);
}
-
/**
* Start the pattern selection dialog. If the UI does not support the
* PatternSelector, start the detailed selection with "selections" as the
@@ -63,91 +38,16 @@
**/
symbol patternSelection()
{
- y2milestone("Running pattern selection dialog");
-
- if ( ! UI::HasSpecialWidget(`PatternSelector ) ||
- UI::WizardCommand(`Ping() ) != true )
- {
- return detailedSelection( nil, !Stage::initial() ); // Fallback: detailed selection
- }
-
- // Help text for software patterns / selections dialog
- string help_text
- = _("<p>
- This dialog allows you to define this system's tasks and what software to install.
- Available tasks and software for this system are shown by category in the left
- column. To view a description for an item, select it in the list.
- </p>")
- + _("<p>
- Change the status of an item by clicking its status icon
- or right-click any icon for a context menu.
- With the context menu, you can also change the status of all items.
- </p>")
- + _("<p>
- <b>Details</b> opens the detailed software package selection
- where you can view and select individual software packages.
- </p>")
- + _("<p>
- The disk usage display in the lower right corner shows the remaining disk space
- after all requested changes will have been performed.
- Hard disk partitions that are full or nearly full can degrade
- system performance and in some cases even cause serious problems.
- The system needs some available disk space to run properly.
- </p>");
-
- // bugzilla #298056
- // [ Back ] [ Cancel ] [ Accept ] buttons with [ Back ] disabled
- Wizard::OpenNextBackDialog();
- Wizard::SetBackButton (`back, Label::BackButton());
- Wizard::SetAbortButton (`cancel, Label::CancelButton());
- Wizard::SetNextButton (`accept, Label::OKButton());
- Wizard::DisableBackButton();
-
- Wizard::SetContents(
- // Dialog title
- // Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
- _("Software Selection and System Tasks"),
- `PatternSelector(`id(`patterns ) ),
- help_text,
- false, // has_back
- true ); // has_next
-
- Wizard::SetDesktopIcon( "sw_single" );
-
- symbol result = nil;
-
- repeat
- {
- result = (symbol) UI::RunPkgSelection(`id(`patterns ) );
- y2milestone( "Pattern selector returned %1", result );
-
- if ( result == `details )
- {
- result = detailedSelection( nil, !Stage::initial() );
-
- if ( result == `cancel )
- // don't get all the way out - the user might just have
- // been scared of the gory details.
- result = nil;
-
- }
-
- } until ( result == `cancel || result == `accept );
-
- Wizard::CloseDialog();
-
- return result;
+ return PackagesUI::RunPatternSelector();
}
-
-
-
///////////////////////////////////////////////////////////////////////////
// MAIN
///////////////////////////////////////////////////////////////////////////
symbol result = `cancel;
+ y2warning("Warning: inst_packages.ycp client is obsoleted, use module PackagesUI.ycp instead");
y2milestone("Stage: %1, Mode: %2, Args: %3", Stage::stage(), Mode::mode(), WFM::Args());
// installation or update from a running system (there is a "Pattern Selection" button) (#229951)
@@ -197,12 +97,12 @@
}
else
{
- result = detailedSelection(mode , repo_mgr);
+ result = detailedSelection(mode , repo_mgr, nil);
}
}
else
{
- result = detailedSelection(`searchMode, false);
+ result = detailedSelection(`searchMode, false, nil);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.29/src/clients/repositories.ycp new/yast2-packager-2.17.34/src/clients/repositories.ycp
--- old/yast2-packager-2.17.29/src/clients/repositories.ycp 2008-10-15 16:55:44.000000000 +0200
+++ new/yast2-packager-2.17.34/src/clients/repositories.ycp 2008-10-22 14:33:30.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose:
* Adding, removing and prioritizing of repositories for packagemanager.
*
- * $Id: repositories.ycp 52110 2008-10-13 10:33:29Z lslezak $
+ * $Id: repositories.ycp 52425 2008-10-22 12:33:30Z lslezak $
*
*/
@@ -66,6 +66,8 @@
// default (minimal) priority of a repository
const integer default_priority = 99;
+ const string priority_label = _("&Priority");
+
// current view:
// selected service (or empty) if all services are selected
string displayed_service = "";
@@ -117,7 +119,21 @@
string PriorityToString(integer priority)
{
- return (priority == default_priority) ? _("Default") : tostring(priority);
+ string ret = tostring(priority);
+
+ // pad to 3 characters
+ integer rest = 3 - size(ret);
+ while(rest > 0) {
+ ret = " " + ret;
+ rest = rest - 1;
+ }
+
+ if (priority == default_priority)
+ {
+ ret = ret + " (" + _("Default") + ")";
+ }
+
+ return ret;
}
list