Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri Feb 9 17:08:12 CET 2007.
--------
--- yast2-packager/yast2-packager.changes 2007-02-06 11:33:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-02-09 15:42:56.111373000 +0100
@@ -1,0 +2,24 @@
+Fri Feb 9 14:04:03 CET 2007 - lslezak@suse.cz
+
+- ignore mounted sources in SpaceCalculation::EvaluateFreeSpace()
+ (#221308)
+- use 'Unsigned Package/File' heading in the callback for
+ handling unsigned files/packages (#171105)
+- removed dependency on yast2-storage (#238673)
+- 2.15.9
+
+-------------------------------------------------------------------
+Wed Feb 7 11:19:24 CET 2007 - locilka@suse.cz
+
+- Removing devs.rpm in case of update before installation starts.
+- Bind-mounting the current instsys:/dev/ to installedsys:/dev/.
+ Both requested in feature #301903.
+
+-------------------------------------------------------------------
+Wed Feb 7 09:47:49 CET 2007 - lslezak@suse.cz
+
+- slideshow - enable Abort button and reset abort status when
+ the slideshow is started again ('install more packages' has
+ been accepted) (#226041)
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.8.tar.bz2
New:
----
yast2-packager-2.15.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.aO8194/_old 2007-02-09 17:08:06.000000000 +0100
+++ /var/tmp/diff_new_pack.aO8194/_new 2007-02-09 17:08:06.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.8)
+# spec file for package yast2-packager (Version 2.15.9)
#
# 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.8
+Version: 2.15.9
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.8.tar.bz2
+Source0: yast2-packager-2.15.9.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
@@ -24,7 +24,6 @@
Requires: yast2-pkg-bindings >= 2.15.4
# Label::SkipButton()
Requires: yast2 >= 2.15.2
-Requires: yast2-storage
Provides: yast2-config-package-manager
Obsoletes: yast2-config-package-manager
Provides: y2t_spkg y2t_inst-packages y2pkginf y2c_spkg
@@ -46,7 +45,7 @@
Arvin Schnell
%prep
-%setup -n yast2-packager-2.15.8
+%setup -n yast2-packager-2.15.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +83,21 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Fri Feb 09 2007 - lslezak@suse.cz
+- ignore mounted sources in SpaceCalculation::EvaluateFreeSpace()
+ (#221308)
+- use 'Unsigned Package/File' heading in the callback for
+ handling unsigned files/packages (#171105)
+- removed dependency on yast2-storage (#238673)
+- 2.15.9
+* Wed Feb 07 2007 - locilka@suse.cz
+- Removing devs.rpm in case of update before installation starts.
+- Bind-mounting the current instsys:/dev/ to installedsys:/dev/.
+ Both requested in feature #301903.
+* Wed Feb 07 2007 - lslezak@suse.cz
+- slideshow - enable Abort button and reset abort status when
+ the slideshow is started again ('install more packages' has
+ been accepted) (#226041)
* Tue Feb 06 2007 - lslezak@suse.cz
- inst_source - display the alias in the overview if the product
is not known (#241032)
++++++ yast2-packager-2.15.8.tar.bz2 -> yast2-packager-2.15.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.8/configure new/yast2-packager-2.15.9/configure
--- old/yast2-packager-2.15.8/configure 2007-02-06 07:26:35.000000000 +0100
+++ new/yast2-packager-2.15.9/configure 2007-02-09 15:37:09.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.8.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.9.
#
# 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.8'
-PACKAGE_STRING='yast2-packager 2.15.8'
+PACKAGE_VERSION='2.15.9'
+PACKAGE_STRING='yast2-packager 2.15.9'
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.8 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.15.9 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.8:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.15.9:";;
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.8
+yast2-packager configure 2.15.9
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.8, which was
+It was created by yast2-packager $as_me 2.15.9, 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.8'
+ VERSION='2.15.9'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.8"
+VERSION="2.15.9"
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.8, which was
+This file was extended by yast2-packager $as_me 2.15.9, 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.8
+yast2-packager config.status 2.15.9
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.8/configure.in new/yast2-packager-2.15.9/configure.in
--- old/yast2-packager-2.15.8/configure.in 2007-02-06 07:26:29.000000000 +0100
+++ new/yast2-packager-2.15.9/configure.in 2007-02-09 15:37:03.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.8, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.9, 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.8"
+VERSION="2.15.9"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.8/src/clients/inst_kickoff.ycp new/yast2-packager-2.15.9/src/clients/inst_kickoff.ycp
--- old/yast2-packager-2.15.8/src/clients/inst_kickoff.ycp 2006-10-30 12:49:56.000000000 +0100
+++ new/yast2-packager-2.15.9/src/clients/inst_kickoff.ycp 2007-02-07 11:23:23.000000000 +0100
@@ -278,6 +278,11 @@
}
}
+ // special logging function for Rendivm
+ void eat2minestrone (string entry) {
+ y2milestone (entry);
+ }
+
/**
* Load all network modules. The package sysconfig requires this during
* update.
@@ -308,6 +313,41 @@
});
}
+ /**
+ * Calls a local command and returns if successful
+ */
+ define boolean LocalCommand (string command) {
+ // FIXME: can be changed into y2debug() later
+ eat2minestrone (sformat ("Running: %1", command));
+ map cmd = (map) WFM::Execute (.local.bash_output, command);
+ eat2minestrone (sformat ("Returned: %1", cmd));
+
+ if (cmd["exit"]:-1 == 0) {
+ return true;
+ } else {
+ if (cmd["stderr"]:"" != "") y2error ("Error: %1", cmd["stderr"]:"");
+ return false;
+ }
+ }
+
+ if (!Mode::update ()) {
+ // fake mtab for rpm post-scripts
+ fake_mtab ();
+ }
+
+ // Feature #301903
+ // When upgrading system, remove devs.rpm if installed
+ if (Mode::update()) {
+ LocalCommand (sformat (
+ "/bin/rpm --root '%1' -q 'devs' && /bin/rpm --nodeps --root '%1' -e 'devs'",
+ String::Quote (Installation::destdir)
+ ));
+ }
+ // Mount (bind) the current /dev/ to the /installed_system/dev/
+ LocalCommand (sformat (
+ "/bin/rm -rf '%1/dev/' && /bin/mkdir -p '%1/dev/' && /bin/mount -v --bind '/dev/' '%1/dev/'",
+ String::Quote (Installation::destdir)
+ ));
if (!Mode::update ())
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.8/src/clients/inst_packages.ycp new/yast2-packager-2.15.9/src/clients/inst_packages.ycp
--- old/yast2-packager-2.15.8/src/clients/inst_packages.ycp 2007-01-17 08:47:55.000000000 +0100
+++ new/yast2-packager-2.15.9/src/clients/inst_packages.ycp 2007-02-09 14:12:35.000000000 +0100
@@ -7,7 +7,6 @@
{
textdomain "packager";
- import "StorageDevices";
import "Mode";
import "Stage";
import "Wizard";
@@ -35,8 +34,8 @@
// while the package manager is initialized
UI::ReplaceWidget(`rep,
mode == nil ?
- `PackageSelector(`id(`packages ), StorageDevices::FloppyDevice ) :
- `PackageSelector(`id(`packages ), `opt(mode), StorageDevices::FloppyDevice )
+ `PackageSelector(`id(`packages ), "") :
+ `PackageSelector(`id(`packages ), `opt(mode), "")
);
symbol result = (symbol) UI::RunPkgSelection(`id(`packages ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.8/src/clients/software_proposal.ycp new/yast2-packager-2.15.9/src/clients/software_proposal.ycp
--- old/yast2-packager-2.15.8/src/clients/software_proposal.ycp 2007-02-01 16:32:00.000000000 +0100
+++ new/yast2-packager-2.15.9/src/clients/software_proposal.ycp 2007-02-09 13:02:58.000000000 +0100
@@ -12,7 +12,6 @@
import "Packages";
import "DirInstall";
- import "Storage";
import "Language";
string func = (string) WFM::Args(0);
@@ -39,8 +38,10 @@
}
else
{
+ integer storage_timestamp = (integer)WFM::call("wrapper_storage", ["GetTargetChangeTime"]);
+
// check the partitioning in installation
- if ( Packages::timestamp != Storage::GetTargetChangeTime() )
+ if ( Packages::timestamp != storage_timestamp )
{
// don't set flag partition_changed if it's the first "change"
if ( Packages::timestamp != 0 )
@@ -49,7 +50,7 @@
}
}
// save information about target change time in module Packages
- Packages::timestamp = Storage::GetTargetChangeTime();
+ Packages::timestamp = storage_timestamp;
}
if (Pkg::GetPackageLocale () != Language::language)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.8/src/clients/wrapper_storage.ycp new/yast2-packager-2.15.9/src/clients/wrapper_storage.ycp
--- old/yast2-packager-2.15.8/src/clients/wrapper_storage.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-packager-2.15.9/src/clients/wrapper_storage.ycp 2007-02-09 15:36:14.000000000 +0100
@@ -0,0 +1,62 @@
+/**
+ * Module: wrapper_storage.ycp
+ *
+ * Authors: Ladislav Slezak
+ *
+ * Purpose: A wrapper for Storage:: module, required for removing yast2-storage dependency
+ *
+ * $Id$
+ */
+
+{
+ string func = (string)WFM::Args(0);
+ list param = [];
+
+ // get parameters if available
+ if (size(WFM::Args()) >= 2)
+ {
+ param = (list) WFM::Args(1);
+ }
+
+ any ret = nil;
+
+ y2milestone("Storage:: wrapper: func: %1, args: %2", func, param);
+
+ import "Storage";
+
+ // call the required function
+ if (func == "GetTargetMap")
+ {
+ ret = Storage::GetTargetMap();
+ }
+ else if (func == "AddPackageList")
+ {
+ ret = Storage::AddPackageList();
+ }
+ else if (func == "GetTargetChangeTime")
+ {
+ ret = Storage::GetTargetChangeTime();
+ }
+ else if (func == "RemoveDmMapsTo")
+ {
+ if (size(param) == 0)
+ {
+ y2error("Missing argument for Storage::RemoveDmMapsTo()");
+ }
+ else
+ {
+ string param1 = (string)param[0]:nil;
+
+ ret = Storage::RemoveDmMapsTo(param1);
+ }
+ }
+ else
+ {
+ // the required function is not known
+ y2error("unknown function: %1", func);
+ }
+
+ y2milestone("Storage wrapper: result: %1", ret);
+
+ return ret;
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.8/src/include/storage_include.ycp new/yast2-packager-2.15.9/src/include/storage_include.ycp
--- old/yast2-packager-2.15.8/src/include/storage_include.ycp 2006-11-01 15:55:54.000000000 +0100
+++ new/yast2-packager-2.15.9/src/include/storage_include.ycp 2007-02-09 13:09:31.000000000 +0100
@@ -8,9 +8,8 @@
{
textdomain "installation";
- import "Storage";
import "SourceManager";
-
+
/**
* Function releases the the device when EVMS is used and the install
* source is disk. See bugzilla 208222 for more details.
@@ -20,9 +19,10 @@
if (install_src_partition != "") {
if (! regexpmatch(install_src_partition, "/dev/"))
install_src_partition = sformat ("/dev/%1", install_src_partition);
-
+
y2milestone ("Calling Storage::RemoveDmMapsTo(%1)", install_src_partition);
- Storage::RemoveDmMapsTo (install_src_partition);
+ any ret = WFM::call("wrapper_storage", ["RemoveDmMapsTo", [install_src_partition]]);
+ y2milestone("Storage::RemoveDmMapsTo(%1) result: %2", install_src_partition, ret);
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.8/src/modules/Packages.ycp new/yast2-packager-2.15.9/src/modules/Packages.ycp
--- old/yast2-packager-2.15.8/src/modules/Packages.ycp 2007-02-02 16:23:42.000000000 +0100
+++ new/yast2-packager-2.15.9/src/modules/Packages.ycp 2007-02-09 15:41:35.000000000 +0100
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif
*
- * $Id: Packages.ycp 35648 2007-01-26 09:36:08Z lslezak $
+ * $Id: Packages.ycp 36003 2007-02-09 14:41:30Z lslezak $
*/
{
@@ -612,14 +612,22 @@
*/
global define list<string> ComputeSystemPackageList ()
{
- import "Storage";
list<string> install_list = architecturePackages ();
install_list = (list<string>) union (install_list, modePackages ());
- install_list = (list<string>) union (install_list,
- Storage::AddPackageList());
- install_list = (list<string>) union (install_list,
- additional_packages);
+
+ // add storage packages if yast2-storage installed
+ list<string> storage_packages = (list<string>)WFM::call("wrapper_storage", ["AddPackageList"]);
+ if (storage_packages == nil)
+ {
+ y2warning("storage_packages is nil, module Storage:: is probably missing");
+ }
+ else
+ {
+ install_list = (list<string>) union (install_list, storage_packages);
+ }
+
+ install_list = (list<string>) union (install_list, additional_packages);
// Kernel is added in autoinstPackages () if autoinst is enabled
if (!Mode::update () || !Mode::autoinst ())
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.8/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.15.9/src/modules/SignatureCheckDialogs.ycp
--- old/yast2-packager-2.15.8/src/modules/SignatureCheckDialogs.ycp 2006-11-22 12:45:56.000000000 +0100
+++ new/yast2-packager-2.15.9/src/modules/SignatureCheckDialogs.ycp 2007-02-09 13:28:47.000000000 +0100
@@ -379,7 +379,7 @@
`HBox (
`VCenter(MessageIcon("warning")),
// popup heading
- `VCenter(`Heading( _("Signature Check Failed"))),
+ `VCenter(`Heading( (item_type == `package) ? _("Unsigned Package") : _("Unsigned File"))),
`HStretch()
),
`MarginBox(0.5, 0.5, `Label(description_text)),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.8/src/modules/SlideShowCallbacks.ycp new/yast2-packager-2.15.9/src/modules/SlideShowCallbacks.ycp
--- old/yast2-packager-2.15.8/src/modules/SlideShowCallbacks.ycp 2007-02-02 17:21:29.000000000 +0100
+++ new/yast2-packager-2.15.9/src/modules/SlideShowCallbacks.ycp 2007-02-09 13:56:39.000000000 +0100
@@ -24,7 +24,6 @@
import "Directory";
boolean _remote_provide = false;
- boolean user_abort = false;
string pkg_inprogress = "";
@@ -43,22 +42,23 @@
{
if ( Mode::normal () )
{
- user_abort = Popup::AnyQuestion( Popup::NoHeadline(),
+ SlideShow::SetUserAbort(Popup::AnyQuestion( Popup::NoHeadline(),
// popup yes-no
_("Do you really want\nto quit the installation?"),
Label::YesButton(),
Label::NoButton(),
- `focus_no );
+ `focus_no ));
}
else if ( Stage::initial () )
{
- user_abort = Popup::ConfirmAbort( `unusable );
+ SlideShow::SetUserAbort(Popup::ConfirmAbort( `unusable ));
}
else // Mode::update (), Stage::cont ()
{
- user_abort = Popup::ConfirmAbort( `incomplete );
+ SlideShow::SetUserAbort(Popup::ConfirmAbort( `incomplete ));
}
- if (user_abort)
+
+ if (SlideShow::GetUserAbort())
{
SlideShow::AppendMessageToInstLog (_("Aborted"));
}
@@ -97,7 +97,7 @@
SlideShow::UpdateCurrentPackageProgress ( percent );
}
HandleInput();
- return ! user_abort;
+ return ! SlideShow::GetUserAbort();
}
@@ -111,7 +111,7 @@
SlideShow::UpdateCurrentPackageProgress( 100 );
_remote_provide = false;
}
- if (user_abort)
+ if (SlideShow::GetUserAbort())
{
return "CANCEL";
}
@@ -315,7 +315,7 @@
if (!cont)
{
- user_abort = true;
+ SlideShow::SetUserAbort(true);
}
// don't check the other partitions
@@ -343,7 +343,7 @@
if (!cont)
{
- user_abort = true;
+ SlideShow::SetUserAbort(true);
}
}
}
@@ -360,10 +360,13 @@
PackageCallbacks::_package_size = install_size;
PackageCallbacks::_deleting_package = is_delete;
- return DisplayStartInstall( name,
+ DisplayStartInstall( name,
summary,
install_size,
is_delete);
+
+ // dummy value, libzypp callback is void()
+ return true;
}
@@ -374,12 +377,17 @@
{
HandleInput();
- if (!user_abort)
+ if (!SlideShow::GetUserAbort())
{
SlideShow::UpdateCurrentPackageProgress ( pkg_percent );
}
- return ! user_abort;
+ if (SlideShow::GetUserAbort())
+ {
+ y2milestone("Aborted at %1%%", pkg_percent);
+ }
+
+ return ! SlideShow::GetUserAbort();
};
/**
@@ -388,7 +396,7 @@
*/
global string DonePackage( integer error, string reason )
{
- if (user_abort)
+ if (SlideShow::GetUserAbort())
return "I";
SlideShow::UpdateCurrentPackageProgress (100);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.8/src/modules/SlideShow.ycp new/yast2-packager-2.15.9/src/modules/SlideShow.ycp
--- old/yast2-packager-2.15.8/src/modules/SlideShow.ycp 2007-02-02 17:27:10.000000000 +0100
+++ new/yast2-packager-2.15.9/src/modules/SlideShow.ycp 2007-02-07 09:58:00.000000000 +0100
@@ -64,6 +64,7 @@
global string inst_log = "";
global boolean debug = false;
+ boolean user_abort = false;
/**
* Constructor
@@ -74,6 +75,15 @@
next_recalc_time = time();
}
+ global void SetUserAbort(boolean abort)
+ {
+ user_abort = abort;
+ }
+
+ global boolean GetUserAbort()
+ {
+ return user_abort;
+ }
/**
* Start the internal (global) timer.
@@ -1589,6 +1599,7 @@
UI::WizardCommand(`ProtectNextButton( false ) );
Wizard::RestoreBackButton();
Wizard::RestoreAbortButton();
+ Wizard::EnableAbortButton();
Wizard::RestoreNextButton();
Wizard::SetContents(
@@ -1600,6 +1611,9 @@
RebuildDialog(true);
Wizard::SetTitleIcon("yast-sw_single");
+
+ // reset abort status
+ SetUserAbort(false);
}
@@ -1780,6 +1794,7 @@
debug = ! debug;
y2milestone( "Debug mode: %1", debug );
}
+ // note: `abort is handled in SlideShowCallbacks::HandleInput()
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.8/src/modules/SpaceCalculation.ycp new/yast2-packager-2.15.9/src/modules/SpaceCalculation.ycp
--- old/yast2-packager-2.15.8/src/modules/SpaceCalculation.ycp 2007-02-02 07:03:30.000000000 +0100
+++ new/yast2-packager-2.15.9/src/modules/SpaceCalculation.ycp 2007-02-09 15:41:35.000000000 +0100
@@ -10,7 +10,7 @@
* on Installation::sourcedir
*
*
- * $Id: SpaceCalculation.ycp 35816 2007-02-02 06:03:27Z lslezak $
+ * $Id: SpaceCalculation.ycp 36003 2007-02-09 14:41:30Z lslezak $
*/
{
@@ -178,7 +178,9 @@
&& mountName != "/cdrom"
&& mountName != "/dev/shm"
&& spec != "udev"
- && !regexpmatch(mountName, "^/media/") )
+ && !regexpmatch(mountName, "^/media/")
+ && !regexpmatch(mountName, "^var/adm/mount/" )
+ )
{
part_info = add ( part_info, "name", substring( mountName, 1 ) ); // remove "/" in front
}
@@ -232,7 +234,6 @@
*/
define list get_partition_info () ``{
- import "Storage";
// remove leading slash so it matches the packages.DU path
boolean remove_slash = true;
@@ -265,7 +266,15 @@
} // !Stage::initial ()
- map targets = Storage::GetTargetMap();
+ // installation stage - Storage:: is definitely present
+ // call Storage::GetTargetMap()
+ map targets = (map)WFM::call("wrapper_storage", ["GetTargetMap"]);
+
+ if (targets == nil)
+ {
+ y2error("Target map is nil, Storage:: is probably missing");
+ }
+
if ( Mode::test () )
{
targets = (map) SCR::Read(.target.yast2, "test_target_map.ycp");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.8/VERSION new/yast2-packager-2.15.9/VERSION
--- old/yast2-packager-2.15.8/VERSION 2007-02-06 07:18:05.000000000 +0100
+++ new/yast2-packager-2.15.9/VERSION 2007-02-09 15:36:33.000000000 +0100
@@ -1 +1 @@
-2.15.8
+2.15.9
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org