Hello community,
here is the log from the commit of package yast2-packager
checked in at Mon Sep 8 16:37:04 CEST 2008.
--------
--- yast2-packager/yast2-packager.changes 2008-09-03 11:50:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-09-08 10:35:10.000000000 +0200
@@ -1,0 +2,27 @@
+Mon Sep 8 10:31:45 CEST 2008 - locilka@suse.cz
+
+- Initializing the installation repository got from install.inf in
+ this order: ZyppRepoURL, YaSTRepoURL, RepoURL (bnc #406162).
+- 2.17.10
+
+-------------------------------------------------------------------
+Fri Sep 5 10:20:06 CEST 2008 - locilka@suse.cz
+
+- Don't show selected desktop in proposal if none has been selected
+ (bnc #422077).
+
+-------------------------------------------------------------------
+Thu Sep 4 14:25:58 CEST 2008 - lslezak@suse.cz
+
+- sw_single: display "Starting the Software Manager" instead of
+ "Starting the Package Manager" (bnc#421952)
+
+-------------------------------------------------------------------
+Wed Sep 3 15:36:01 CEST 2008 - locilka@suse.cz
+
+- Adjusting SlideShow in inst_rpmcopy if not set.
+- Using new "replaces" key returned by Pkg::ResolvableProperties
+ while upgrading add-on product. Different workflow is used for
+ installation and update (FATE #301997).
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.17.9.tar.bz2
New:
----
yast2-packager-2.17.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.Yv8768/_old 2008-09-08 16:36:58.000000000 +0200
+++ /var/tmp/diff_new_pack.Yv8768/_new 2008-09-08 16:36:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.17.9)
+# spec file for package yast2-packager (Version 2.17.10)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-packager
-Version: 2.17.9
+Version: 2.17.10
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.17.9.tar.bz2
+Source0: yast2-packager-2.17.10.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
@@ -80,7 +80,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.17.9
+%setup -n yast2-packager-2.17.10
%build
%{prefix}/bin/y2tool y2autoconf
@@ -116,6 +116,21 @@
%{prefix}/lib/YaST2/servers_non_y2/ag_*
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog
+* Mon Sep 08 2008 locilka@suse.cz
+- Initializing the installation repository got from install.inf in
+ this order: ZyppRepoURL, YaSTRepoURL, RepoURL (bnc #406162).
+- 2.17.10
+* Fri Sep 05 2008 locilka@suse.cz
+- Don't show selected desktop in proposal if none has been selected
+ (bnc #422077).
+* Thu Sep 04 2008 lslezak@suse.cz
+- sw_single: display "Starting the Software Manager" instead of
+ "Starting the Package Manager" (bnc#421952)
+* Wed Sep 03 2008 locilka@suse.cz
+- Adjusting SlideShow in inst_rpmcopy if not set.
+- Using new "replaces" key returned by Pkg::ResolvableProperties
+ while upgrading add-on product. Different workflow is used for
+ installation and update (FATE #301997).
* Wed Sep 03 2008 locilka@suse.cz
- Fixed inst_custom_packages YCP script to reflect the changes done
in SlideShow*.
++++++ yast2-packager-2.17.9.tar.bz2 -> yast2-packager-2.17.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.9/configure new/yast2-packager-2.17.10/configure
--- old/yast2-packager-2.17.9/configure 2008-09-03 10:48:18.000000000 +0200
+++ new/yast2-packager-2.17.10/configure 2008-09-08 10:39:20.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.9.
+# Generated by GNU Autoconf 2.61 for yast2-packager 2.17.10.
#
# 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.9'
-PACKAGE_STRING='yast2-packager 2.17.9'
+PACKAGE_VERSION='2.17.10'
+PACKAGE_STRING='yast2-packager 2.17.10'
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.9 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.17.10 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.9:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.17.10:";;
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.9
+yast2-packager configure 2.17.10
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.9, which was
+It was created by yast2-packager $as_me 2.17.10, 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.9'
+ VERSION='2.17.10'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.9"
+VERSION="2.17.10"
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.9, which was
+This file was extended by yast2-packager $as_me 2.17.10, 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.9
+yast2-packager config.status 2.17.10
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.9/configure.in new/yast2-packager-2.17.10/configure.in
--- old/yast2-packager-2.17.9/configure.in 2008-09-03 10:48:15.000000000 +0200
+++ new/yast2-packager-2.17.10/configure.in 2008-09-08 10:39:17.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.17.9, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.17.10, 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.9"
+VERSION="2.17.10"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.9/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.17.10/src/clients/inst_rpmcopy.ycp
--- old/yast2-packager-2.17.9/src/clients/inst_rpmcopy.ycp 2008-09-02 17:28:27.000000000 +0200
+++ new/yast2-packager-2.17.10/src/clients/inst_rpmcopy.ycp 2008-09-05 10:19:29.000000000 +0200
@@ -13,7 +13,7 @@
* Packages module :
* "installed"
*
- * $Id: inst_rpmcopy.ycp 50558 2008-09-02 09:23:10Z visnov $
+ * $Id: inst_rpmcopy.ycp 50706 2008-09-04 19:38:40Z visnov $
*/
{
@@ -901,10 +901,25 @@
integer maxnumbercds = cdnumbers["maxnumbercds"]:10;
integer current_cd_no = cdnumbers["current_cd_no"]:1;
+ map > get_setup = SlideShow::GetSetup();
+ if (get_setup == nil || get_setup == $[]) {
+ y2milestone ("No SlideShow setup has been set, adjusting");
+ SlideShow::Setup([$[
+ "name" : "packages",
+ "description" : _("Installing Packages..."),
+ "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes
+ "units" : `kb,
+ ]]);
+ }
+ get_setup = nil;
+
// re-initialize package information
PackageSlideShow::InitPkgData(true);
// we want the table
SlideShow::ShowTable();
+
+ SlideShow::OpenDialog();
+
// move the progress to the packages stage
SlideShow::MoveToStage("packages");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.9/src/clients/repositories.ycp new/yast2-packager-2.17.10/src/clients/repositories.ycp
--- old/yast2-packager-2.17.9/src/clients/repositories.ycp 2008-08-25 14:13:28.000000000 +0200
+++ new/yast2-packager-2.17.10/src/clients/repositories.ycp 2008-09-05 14:54:31.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose:
* Adding, removing and prioritizing of repositories for packagemanager.
*
- * $Id: repositories.ycp 50279 2008-08-21 14:13:58Z lslezak $
+ * $Id: repositories.ycp 50737 2008-09-05 12:11:35Z lslezak $
*
*/
@@ -888,6 +888,7 @@
{
// dialog caption
Wizard::SetContents(_("Initializing..."), `Empty (), "", false, true);
+ Pkg::TargetInit("/", true);
}
// check whether running as root
@@ -991,18 +992,6 @@
return ret;
}
-else
-{
- y2milestone("Initializing the target...");
-
- // disable callbasks in command line mode
- if (size(WFM::Args()) > 0)
- {
- Mode::SetUI ("commandline");
- }
-
- Pkg::TargetInit("/", true);
-}
return CommandLine::Run(cmdline_description);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.9/src/clients/sw_single.ycp new/yast2-packager-2.17.10/src/clients/sw_single.ycp
--- old/yast2-packager-2.17.9/src/clients/sw_single.ycp 2008-09-02 17:28:27.000000000 +0200
+++ new/yast2-packager-2.17.10/src/clients/sw_single.ycp 2008-09-05 10:19:29.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 50564 2008-09-02 11:46:40Z kmachalkova $
+ * $Id: sw_single.ycp 50663 2008-09-04 12:27:36Z lslezak $
*
* Note: sw_single accepts a map parameter: $[ "dialog_type" : symbol,
* "repo_mgmt" : boolean ]
@@ -59,7 +59,7 @@
}
// a stage in the progress dialog
- Progress::New(_("Starting the Package Manager"), "", 2, stages, [], "");
+ Progress::New(_("Starting the Software Manager"), "", 2, stages, [], "");
Progress::NextStage();
import "Packages";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.17.9/src/modules/AddOnProduct.ycp new/yast2-packager-2.17.10/src/modules/AddOnProduct.ycp
--- old/yast2-packager-2.17.9/src/modules/AddOnProduct.ycp 2008-08-14 15:31:37.000000000 +0200
+++ new/yast2-packager-2.17.10/src/modules/AddOnProduct.ycp 2008-09-05 10:19:01.000000000 +0200
@@ -310,10 +310,10 @@
boolean enable_repo_management = Mode::normal();
map args = $[ "dialog_type" : mode, "repo_mgmt" : enable_repo_management ];
- y2milestone("Arguments for sw_single: %1", args);
+ y2milestone ("Arguments for sw_single: %1", args);
any ret = WFM::CallFunction ("sw_single", [args]);
- y2milestone("sw_single returned: %1", ret);
+ y2milestone ("sw_single returned: %1", ret);
if (ret == `abort || ret == `cancel || ret == `close)
return `abort;
@@ -378,14 +378,23 @@
return nil;
}
+ string current_stage = "normal";
+ string current_mode = Mode::mode();
+
+ list <map> steps = ProductControl::getModules (current_stage, current_mode, `enabled);
+ if (steps == nil || size (steps) < 1) {
+ y2warning ("Add-On product workflow for stage: %1, mode: %2 not defined", current_stage, current_mode);
+ return nil;
+ }
+
// start workflow
Wizard::OpenNextBackStepsDialog();
// dialog caption
Wizard::SetContents(_("Initializing..."), `Empty (), "", false, false);
- list<map> stage_mode = [$["stage": "normal", "mode": "installation" ]];
- ProductControl::AddWizardSteps(stage_mode);
- Mode::SetMode ("installation");
+ list <map> stage_mode = [$["stage": current_stage, "mode": current_mode, ]];
+ ProductControl::AddWizardSteps (stage_mode);
+
symbol ret = ProductControl::Run();
UI::CloseDialog();
@@ -554,15 +563,36 @@
// FATE #302398: PATTERNS keyword in content file
HandleProductPATTERNS (src_id);
+ list