Mailinglist Archive: opensuse-commit (1097 mails)
| < Previous | Next > |
commit yast2-storage for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 25 Jan 2010 16:00:48 +0100
- Message-id: <20100125150048.BE465202A6@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at Mon Jan 25 16:00:48 CET 2010.
--------
--- yast2-storage/yast2-storage.changes 2010-01-14 14:54:31.000000000 +0100
+++ yast2-storage/yast2-storage.changes 2010-01-22 14:37:59.000000000 +0100
@@ -1,0 +2,32 @@
+Thu Jan 21 17:28:48 CET 2010 - aschnell@xxxxxxx
+
+- implemented moving of newly created partitions (see bnc #541034)
+- 2.19.4
+
+-------------------------------------------------------------------
+Tue Jan 19 14:14:26 CET 2010 - fehr@xxxxxxx
+
+- allow to use cylinder 0 for partition (bnc #571749)
+
+-------------------------------------------------------------------
+Mon Jan 18 17:50:59 CET 2010 - aschnell@xxxxxxx
+
+- added NFS4 support (fate #305171)
+
+-------------------------------------------------------------------
+Mon Jan 18 12:47:39 CET 2010 - aschnell@xxxxxxx
+
+- fixed resizing of LVM logical volumes on S390 (bnc #571159)
+
+-------------------------------------------------------------------
+Mon Jan 18 11:53:51 CET 2010 - aschnell@xxxxxxx
+
+- show textual error messages during commit (bnc #546012)
+
+-------------------------------------------------------------------
+Fri Jan 15 11:42:55 CET 2010 - aschnell@xxxxxxx
+
+- implemented popup to query user whether to ignore failures during
+ commit (fate #304500)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-storage-2.19.3.tar.bz2
New:
----
yast2-storage-2.19.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.bY2rS3/_old 2010-01-25 15:59:30.000000000 +0100
+++ /var/tmp/diff_new_pack.bY2rS3/_new 2010-01-25 15:59:30.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.19.3)
+# spec file for package yast2-storage (Version 2.19.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,19 +19,19 @@
Name: yast2-storage
-Version: 2.19.3
+Version: 2.19.4
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.19.3.tar.bz2
+Source0: yast2-storage-2.19.4.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPLv2+
BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel
sablot swig
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer
sgml-skel update-desktop-files
-BuildRequires: libstorage-devel >= 2.19.5 yast2 >= 2.18.19 yast2-core-devel
= 2.18.1 yast2-devtools+BuildRequires: libstorage-devel >= 2.19.6 yast2 >= 2.19.4 yast2-core-devel >=
2.18.1 yast2-devtools
BuildRequires: yast2-perl-bindings yast2-testsuite >= 2.19.0
Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}'
libstorage`)
-Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.18.19
yast2-libyui >= 2.18.7
+Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.19.4
yast2-libyui >= 2.18.7
Requires: yast2-dbus-client
%ifarch s390 s390x
Requires: yast2-s390
@@ -52,7 +52,7 @@
devices during installation and on an installed system.
%prep
-%setup -n yast2-storage-2.19.3
+%setup -n yast2-storage-2.19.4
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-storage-2.19.3.tar.bz2 -> yast2-storage-2.19.4.tar.bz2 ++++++
++++ 2222 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/VERSION new/yast2-storage-2.19.4/VERSION
--- old/yast2-storage-2.19.3/VERSION 2010-01-14 14:47:49.000000000 +0100
+++ new/yast2-storage-2.19.4/VERSION 2010-01-22 14:28:31.000000000 +0100
@@ -1 +1 @@
-2.19.3
+2.19.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/bindings/src/StorageCallbacks.cc
new/yast2-storage-2.19.4/bindings/src/StorageCallbacks.cc
--- old/yast2-storage-2.19.3/bindings/src/StorageCallbacks.cc 2009-12-03
15:39:07.000000000 +0100
+++ new/yast2-storage-2.19.4/bindings/src/StorageCallbacks.cc 2010-01-15
10:42:00.000000000 +0100
@@ -46,7 +46,8 @@
extern CallbackProgressBar progress_bar_cb_ycp;
extern CallbackShowInstallInfo install_info_cb_ycp;
extern CallbackInfoPopup info_popup_cb_ycp;
- extern CallbackYesNoPopup yesno_popup_cb_ycp;
+ extern CallbackYesNoPopup yesno_popup_cb_ycp;
+ extern CallbackCommitErrorPopup commit_error_popup_cb_ycp;
extern CallbackPasswordPopup password_popup_cb_ycp;
}
@@ -212,6 +213,7 @@
static Y2Function* show_install_info = NULL;
static Y2Function* info_popup = NULL;
static Y2Function* yesno_popup = NULL;
+static Y2Function* commit_error_popup = NULL;
static Y2Function* password_popup = NULL;
void progress_bar_callback( const string& id, unsigned cur, unsigned max )
@@ -268,6 +270,27 @@
}
+bool commit_error_popup_callback(int error, const string& last_action, const
string& extended_message)
+{
+ bool ret = false;
+
+ if (commit_error_popup)
+ {
+ commit_error_popup->reset();
+ commit_error_popup->appendParameter(YCPInteger(error));
+ commit_error_popup->appendParameter(YCPString(last_action));
+ commit_error_popup->appendParameter(YCPString(extended_message));
+ commit_error_popup->finishParameters();
+
+ YCPValue tmp = commit_error_popup->evaluateCall();
+ if (tmp->isBoolean())
+ ret = tmp->asBoolean()->value();
+ }
+
+ return ret;
+}
+
+
bool password_popup_callback(const string& device, int attempts, string&
password)
{
bool ret = false;
@@ -476,6 +499,53 @@
}
+YCPValue
+StorageCallbacks::CommitErrorPopup(const YCPString& callback)
+{
+ string name_r = callback->value();
+
+ y2debug("Registering callback %s", name_r.c_str());
+ string::size_type colonpos = name_r.find("::");
+
+ if (colonpos == string::npos)
+ {
+ ycp2error ("Specify namespace and the fuction name for a callback");
+ return YCPVoid ();
+ }
+
+ string module = name_r.substr(0, colonpos);
+ string name = name_r.substr(colonpos + 2);
+
+ Y2Component* c = Y2ComponentBroker::getNamespaceComponent(module.c_str());
+ if (c == NULL)
+ {
+ ycp2error("No component can provide namespace %s for a callback of %s",
+ module.c_str(), name.c_str());
+ return YCPVoid();
+ }
+
+ Y2Namespace* ns = c->import(module.c_str());
+ if (ns == NULL)
+ {
+ y2error("No namespace %s for a callback of %s", module.c_str(),
+ name.c_str());
+ return YCPVoid();
+ }
+
+ commit_error_popup = ns->createFunctionCall(name, Type::Unspec);
+ if (commit_error_popup == NULL)
+ {
+ ycp2error("Cannot find function %s in module %s as a callback",
+ name.c_str(), module.c_str());
+ return YCPVoid();
+ }
+
+ storage::commit_error_popup_cb_ycp = commit_error_popup_callback;
+
+ return YCPVoid();
+}
+
+
YCPValue
StorageCallbacks::PasswordPopup (const YCPString & callback)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/bindings/src/StorageCallbacks.h
new/yast2-storage-2.19.4/bindings/src/StorageCallbacks.h
--- old/yast2-storage-2.19.3/bindings/src/StorageCallbacks.h 2009-07-21
16:37:07.000000000 +0200
+++ new/yast2-storage-2.19.4/bindings/src/StorageCallbacks.h 2010-01-15
11:18:04.000000000 +0100
@@ -58,6 +58,8 @@
/* TYPEINFO: void(string) */
YCPValue YesNoPopup (const YCPString& func);
/* TYPEINFO: void(string) */
+ YCPValue CommitErrorPopup (const YCPString& func);
+ /* TYPEINFO: void(string) */
YCPValue PasswordPopup (const YCPString& func);
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/configure.in new/yast2-storage-2.19.4/configure.in
--- old/yast2-storage-2.19.3/configure.in 2010-01-14 14:50:52.000000000
+0100
+++ new/yast2-storage-2.19.4/configure.in 2010-01-22 14:35:49.000000000
+0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.19.3, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.19.4, http://bugs.opensuse.org/, yast2-storage)
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.19.3"
+VERSION="2.19.4"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell <aschnell@xxxxxxx>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/storage/src/include/ep-all.ycp
new/yast2-storage-2.19.4/storage/src/include/ep-all.ycp
--- old/yast2-storage-2.19.3/storage/src/include/ep-all.ycp 2010-01-11
11:14:07.000000000 +0100
+++ new/yast2-storage-2.19.4/storage/src/include/ep-all.ycp 2010-01-15
15:52:07.000000000 +0100
@@ -71,7 +71,7 @@
configs = add(configs, `item(`id(`xpram), `icon("yast-xpram"),
_("Configure &XPRAM...")));
}
- if (size(configs) > 0) {
+ if (!isempty(configs)) {
// menu button text
buttons = add(buttons, `MenuButton(`opt(`key_F7),
_("Configure..."), configs));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/storage/src/include/ep-dialogs.ycp
new/yast2-storage-2.19.4/storage/src/include/ep-dialogs.ycp
--- old/yast2-storage-2.19.3/storage/src/include/ep-dialogs.ycp 2010-01-08
15:49:37.000000000 +0100
+++ new/yast2-storage-2.19.4/storage/src/include/ep-dialogs.ycp 2010-01-21
15:10:16.000000000 +0100
@@ -592,7 +592,7 @@
if (used_fs != `swap)
{
map free_data = Storage::GetFreeSpace(device, used_fs, true);
- if (size(free_data) == 0 || !free_data["ok"]:false)
+ if (isempty(free_data) || !free_data["ok"]:false)
{
y2error("Failed to retrieve FreeSpace %1, filesystem %2",
device, data["used_fs"]:`none);
//FIXME: Really?
@@ -622,7 +622,8 @@
heading = sformat(_("Resize Partition %1"), device);
cyl_size = disk["cyl_size"]:1;
- free_cyl_after = Storage::FreeCylindersAfterPartition(device);
+ integer free_cyl_before = 0;
+ Storage::FreeCylindersAroundPartition(device, free_cyl_before,
free_cyl_after);
min_size_k = Integer::Max([ min_size_k, cyl_size / 1024 ]);
max_size_k = size_k + (cyl_size * free_cyl_after) / 1024;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/storage/src/include/ep-hd-dialogs.ycp
new/yast2-storage-2.19.4/storage/src/include/ep-hd-dialogs.ycp
--- old/yast2-storage-2.19.3/storage/src/include/ep-hd-dialogs.ycp
2009-11-27 17:09:14.000000000 +0100
+++ new/yast2-storage-2.19.4/storage/src/include/ep-hd-dialogs.ycp
2010-01-21 16:30:51.000000000 +0100
@@ -142,9 +142,9 @@
`LeftRadioButtonWithAttachment(`id(`manual_region), `opt(`notify), _("Custom
Region"),
`VBox(`id(`manual_region_attachment),
`MinWidth(10, `IntField(`id(`start_cyl), _("Start Cylinder"),
-
1, cyl_count, Region::Start(region))),
+
0, cyl_count, Region::Start(region))),
`MinWidth(10, `IntField(`id(`end_cyl), _("End Cylinder"),
-
1, cyl_count, Region::End(region)))
+
0, cyl_count, Region::End(region)))
))
)
)
@@ -340,11 +340,99 @@
}
+ boolean DlgMovePartition(map<string, any>& part)
+ {
+ string device = part["device"]:"error";
+
+ integer free_cyl_before = 0;
+ integer free_cyl_after = 0;
+
+ Storage::FreeCylindersAroundPartition(device, free_cyl_before,
free_cyl_after);
+
+ if (free_cyl_before == 0 && free_cyl_after == 0)
+ {
+ // error popup text, %1 is replace with name of partition
+ Popup::Error(sformat(_("No space to moved partition %1."), device));
+ return false;
+ }
+
+ integer move = 0;
+
+ if (free_cyl_before > 0 && free_cyl_after == 0)
+ {
+ // popup text, %1 is replace with name of partition
+ if (!Popup::YesNo(sformat(_("Move partition %1 forward?"), device)))
+ return false;
+
+ move = -free_cyl_before;
+ }
+ else if (free_cyl_before == 0 && free_cyl_after > 0)
+ {
+ // popup text, %1 is replace with name of partition
+ if (!Popup::YesNo(sformat(_("Move partition %1 backward?"),
device)))
+ return false;
+
+ move = free_cyl_after;
+ }
+ else if (free_cyl_before > 0 && free_cyl_after > 0)
+ {
+ UI::OpenDialog(`opt(`decorated),
+ Greasemonkey::Transform(
+ `VBox(
+ `MarginBox(2, 0.4,
+
`RadioButtonGroup(`id(`directions),
+ `VBox(
+ // popup
text, %1 is replace with name of partition
+
`Label(sformat(_("Move partition %1?"), device)),
+ // radio
button text
+
`LeftRadioButton(`id(`forward), _("Forward"), true),
+ // radio
button text
+
`LeftRadioButton(`id(`backward), _("Backward"))
+ ))),
+ `ButtonBox(
+ `PushButton(`id(`cancel),
`opt(`cancelButton), Label::CancelButton()),
+ `PushButton(`id(`ok), `opt(`default,
`okButton), Label::OKButton())
+ )
+ )
+ )
+ );
+
+ symbol widget = (symbol) UI::UserInput();
+
+ symbol direction = (symbol) UI::QueryWidget(`id(`directions),
`Value);
+
+ UI::CloseDialog();
+
+ if (widget != `ok)
+ return false;
+
+ switch (direction)
+ {
+ case `forward:
+ move = -free_cyl_before;
+ break;
+
+ case `backward:
+ move = free_cyl_after;
+ break;
+ }
+ }
+
+ if (move == 0)
+ return false;
+
+ part["region", 0] = part["region", 0]:0 + move;
+ y2milestone("part:%1", part);
+ return true;
+ }
+
+
boolean DlgResizePartition(map<string, any> &data, map <string, any> disk)
{
return DlgResize(data, disk);
}
+
boolean ConfirmPartitionsDelete( string disk, list<string> pnames )
{
return ConfirmRecursiveDelete( disk, pnames,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/storage/src/include/ep-hd-lib.ycp
new/yast2-storage-2.19.4/storage/src/include/ep-hd-lib.ycp
--- old/yast2-storage-2.19.3/storage/src/include/ep-hd-lib.ycp 2010-01-11
16:32:42.000000000 +0100
+++ new/yast2-storage-2.19.4/storage/src/include/ep-hd-lib.ycp 2010-01-21
14:48:11.000000000 +0100
@@ -269,6 +269,52 @@
}
+ void EpMovePartition(string device)
+ {
+ if (device == nil)
+ {
+ // error popup
+ Popup::Error(_("No partition selected."));
+ return;
+ }
+
+ map<string, map> target_map = Storage::GetTargetMap();
+ map<string, any> disk = Storage::GetDisk(target_map, device);
+ map<string, any> part = Storage::GetPartition(target_map, device);
+
+ if (disk["readonly"]:false)
+ {
+ Popup::Error(Partitions::RdonlyText(disk["device"]:"", true));
+ return;
+ }
+
+ if (!part["create"]:false)
+ {
+ // error popup, %1 is replace by partition device name, e.g.
/dev/sdb1
+ Popup::Error(sformat(_("The partition %1 is already created on disk
+and cannot be moved."), device));
+ return;
+ }
+
+ if (part["type"]:`primary == `extended)
+ {
+ // error popup text
+ Popup::Error(_("An extended partition cannot be moved."));
+ return;
+ }
+
+ if (DlgMovePartition(part))
+ {
+ if (Storage::UpdatePartition(device, part["region", 0]:0,
part["region", 1]:0))
+ {
+ UpdateMainStatus();
+ TreePanel::Create();
+ UpdateTableFocus(device);
+ }
+ }
+ }
+
+
void EpResizePartition(string device)
{
if (device == nil)
@@ -366,30 +412,31 @@
string mypart_table_type = target_map[ device, "label"
]:Storage::DefaultDiskLabel( mysize );
// helptext
- string helptext = _("<p>Select one or more (if available) hard disks
-that will have the same partition layout as
-this disk.</p>
+ string helptext = _("<p>Select one or more (if available) hard disks
+that will have the same partition layout as
+this disk.</p>
<p>Disks marked with '*' sign contain one or
-more partitions. After cloning, these
+more partitions. After cloning, these
partitions will be deleted.</p>");
- list <string> AvailableTargetDisks() {
- list <string> items = [];
-
+ list <string> AvailableTargetDisks()
+ {
map <string, map> filtered_target_map =
filter( string dev, map props, target_map, {
- return ( dev != device &&
- Storage::IsDiskType( props["type"]:`CT_UNKNOWN ) &&
- props["used_by_device"]:"" == "" &&
- props["cyl_size"]:0 == mycyl_size );
+ return dev != device &&
+ Storage::IsDiskType( props["type"]:`CT_UNKNOWN ) &&
+ isempty(props["used_by"]:[]) &&
+ props["cyl_size"]:0 == mycyl_size;
});
y2milestone("Available, suitable and unused disks (other than %1):
%2", device, Map::Keys(filtered_target_map));
+ list <string> items = [];
+
foreach( string dev, map props, filtered_target_map,{
if( props["size_k"]:0 >= mysize )
- items = add(items, dev);
- else
+ items = add(items, dev);
+ else
y2milestone("%1 is smaller than needed, skipping it",
device);
});
@@ -417,7 +464,7 @@
}
if (isempty(myparts)) {
- Popup::Error(_("There are no partitions on this disk (a clonable
+ Popup::Error(_("There are no partitions on this disk (a clonable
disk must have at least one partition).
Create some partitions before cloning the disk."));
return;
@@ -426,7 +473,7 @@
list <string> mydisks = AvailableTargetDisks();
if (isempty(mydisks)) {
- Popup::Error("This disk cannot be cloned. There are no suitable
+ Popup::Error("This disk cannot be cloned. There are no suitable
disks that could have the same partitioning layout.");
return;
}
@@ -485,7 +532,7 @@
});
//if there is anything to delete, ask user if s/he really wants
to delete
- if ( !isempty(partitions_to_delete) &&
+ if ( !isempty(partitions_to_delete) &&
!ConfirmDeletePartitions( partitions_to_delete )) {
ret = nil;
continue;
@@ -518,10 +565,10 @@
foreach( map one_partition, myparts, {
map next = Storage::NextPartition( this_disk,
one_partition["type"]:`none);
- Storage::CreatePartition( this_disk,
next["device"]:"error",
+ Storage::CreatePartition( this_disk,
next["device"]:"error",
one_partition["type"]:`primary,
one_partition["fsid"]:
Partitions::fsid_native,
- one_partition["region",0]:0,
one_partition["region",1]:0,
+ one_partition["region",0]:0,
one_partition["region",1]:0,
one_partition["mountby"]:Storage::GetMountBy(device) );
//FIXME: ChangeVolumeProperties too?
});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/storage/src/include/ep-hd.ycp
new/yast2-storage-2.19.4/storage/src/include/ep-hd.ycp
--- old/yast2-storage-2.19.3/storage/src/include/ep-hd.ycp 2010-01-12
14:01:49.000000000 +0100
+++ new/yast2-storage-2.19.4/storage/src/include/ep-hd.ycp 2010-01-21
11:08:22.000000000 +0100
@@ -34,6 +34,7 @@
void EpContextMenuHdPartition(string device)
{
symbol widget = ContextMenu::Simple([ `item(`id(`edit), _("Edit")),
+ `item(`id(`move), _("Move")),
`item(`id(`resize), _("Resize")),
`item(`id(`delete), _("Delete"))
]);
@@ -43,6 +44,10 @@
EpEditPartition(device);
break;
+ case `move:
+ EpMovePartition(device);
+ break;
+
case `resize:
EpResizePartition(device);
break;
@@ -60,6 +65,8 @@
// push button text
`PushButton(`id(`edit),`opt(`key_F4), _("Edit...")),
// push button text
+ `PushButton(`id(`move), `opt(`key_F7), _("Move...")),
+ // push button text
`PushButton(`id(`resize), `opt(`key_F6), _("Resize...")),
// push button text
`PushButton(`id(`delete), `opt(`key_F5), _("Delete..."))
@@ -90,12 +97,7 @@
switch (Event::IsWidgetActivated(event))
{
case `add:
- if (is_disk)
- EpCreatePartition(disk_device);
- else
- // error popup
- Popup::Error(_("Select a hard disks, BIOS RAIDs or multipath
-devices to add a partition."));
+ EpCreatePartition(disk_device);
break;
case `edit:
@@ -105,6 +107,15 @@
EpEditPartition( device );
break;
+ case `move:
+ if (is_disk)
+ // error popup
+ Popup::Error(_("Hard disks, BIOS RAIDs and multipath
+devices cannot be moved."));
+ else
+ EpMovePartition(device);
+ break;
+
case `resize:
if (is_disk)
// error popup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/storage/src/include/ep-lib.ycp
new/yast2-storage-2.19.4/storage/src/include/ep-lib.ycp
--- old/yast2-storage-2.19.3/storage/src/include/ep-lib.ycp 2010-01-13
18:43:03.000000000 +0100
+++ new/yast2-storage-2.19.4/storage/src/include/ep-lib.ycp 2010-01-16
18:15:14.000000000 +0100
@@ -302,12 +302,13 @@
});
Storage::SetTargetMap(ti[0]:$[]);
- Storage::DisposeTargetBackup("import");
}
else
{
Storage::RestoreTargetBackup("import");
}
+
+ Storage::DisposeTargetBackup("import");
}
@@ -387,7 +388,7 @@
float tmp = (float) Region::Length(region) / (float)
disk["cyl_count"]:1;
y2debug("i:%1 this cyl:%2 end cyl:%3 next cyl:%4",
i, ccyl, Region::End(region), next_cyl);
- AddSegment(tmp, part["device"]:"", part["size_k"]:0);
+ AddSegment(tmp, part["name"]:"", part["size_k"]:0);
// Now there is some xtra space between the end of this
partition and the start of the next one
// or the end of the disk if
@@ -417,7 +418,7 @@
foreach(map partition, partitions, {
integer size_k = partition["size_k"]:0;
disk_free_k = disk_free_k - size_k;
- AddSegment((float) size_k / (float) disk_size_k,
partition["device"]:"", size_k);
+ AddSegment((float) size_k / (float) disk_size_k,
partition["name"]:"", size_k);
});
if (disk_free_k > 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/storage/src/include/ep-lvm-lib.ycp
new/yast2-storage-2.19.4/storage/src/include/ep-lvm-lib.ycp
--- old/yast2-storage-2.19.3/storage/src/include/ep-lvm-lib.ycp 2010-01-14
11:48:41.000000000 +0100
+++ new/yast2-storage-2.19.4/storage/src/include/ep-lvm-lib.ycp 2010-01-15
16:07:54.000000000 +0100
@@ -42,7 +42,7 @@
void EpCreateVolumeGroup()
{
map<string, map> target_map = Storage::GetTargetMap();
- list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), {
return isempty(pv["used_by_device"]:""); });
+ list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), {
return isempty(pv["used_by"]:[]); });
if (size(unused_pvs) < 1)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/storage/src/include/ep-nfs.ycp
new/yast2-storage-2.19.4/storage/src/include/ep-nfs.ycp
--- old/yast2-storage-2.19.3/storage/src/include/ep-nfs.ycp 2010-01-05
17:10:04.000000000 +0100
+++ new/yast2-storage-2.19.4/storage/src/include/ep-nfs.ycp 2010-01-19
12:26:10.000000000 +0100
@@ -113,9 +113,13 @@
target_map = Storage::GetTargetMap();
list<map> nfs_list = target_map["/dev/nfs", "partitions"]:[];
- integer sizeK = Storage::CheckNfsVolume (entry["device"]:"",
entry["fstopt"]:"");
+ string device = entry["device"]:"";
+ string mount = entry["mount"]:"";
+ string opts = entry["fstopt"]:"";
+ boolean nfs4 = entry["vfstype"]:"nfs" == "nfs4";
- if ( sizeK <= 0)
+ integer sizeK = Storage::CheckNfsVolume(device, opts, nfs4);
+ if (sizeK <= 0)
{
//rollback only if user does not want to save (#450060)
//the mount might fail later if the errors are not corrected,
but the user has been warned
@@ -130,7 +134,7 @@
//real size - Perl then wants to die in addNfsVolume call
sizeK = 0;
}
- Storage::AddNfsVolume( entry["device"]:"", entry["fstopt"]:"",
sizeK, entry["mount"]:"");
+ Storage::AddNfsVolume(device, opts, sizeK, mount, nfs4);
}
void EditShare( map <string, any> entry )
@@ -156,6 +160,7 @@
{
m["fstopt"] = entry["fstopt"]:"";
m["mount"] = entry["mount"]:"";
+ m["vfstype"] = entry["used_fs"]:`nfs == `nfs ? "nfs" :
"nfs4";
}
return m;
});
@@ -210,8 +215,6 @@
//a hack - we don't have overviews for nfs dirs, so let's switch to the
main panel ...
CreateNfsMainPanel( user_data );
UI::ChangeWidget(`tree, `CurrentItem, `nfs );
-
}
-
- }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/storage/src/include/ep-raid-lib.ycp
new/yast2-storage-2.19.4/storage/src/include/ep-raid-lib.ycp
--- old/yast2-storage-2.19.3/storage/src/include/ep-raid-lib.ycp
2010-01-14 11:46:04.000000000 +0100
+++ new/yast2-storage-2.19.4/storage/src/include/ep-raid-lib.ycp
2010-01-15 16:07:44.000000000 +0100
@@ -42,7 +42,7 @@
void EpCreateRaid()
{
map<string, map> target_map = Storage::GetTargetMap();
- list<map> unused_devices = filter(map dev,
get_possible_rds(target_map), { return isempty(dev["used_by_device"]:""); });
+ list<map> unused_devices = filter(map dev,
get_possible_rds(target_map), { return isempty(dev["used_by"]:[]); });
if (size(unused_devices) < 2)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/storage/src/include/ep-unused.ycp
new/yast2-storage-2.19.4/storage/src/include/ep-unused.ycp
--- old/yast2-storage-2.19.3/storage/src/include/ep-unused.ycp 2009-08-26
11:44:00.000000000 +0200
+++ new/yast2-storage-2.19.4/storage/src/include/ep-unused.ycp 2010-01-15
15:59:26.000000000 +0100
@@ -20,8 +20,8 @@
if (partition == nil)
{
- if (disk["partitions"]:[] == [] &&
- disk["used_by_type"]:`UB_NONE == `UB_NONE)
+ if (isempty(disk["partitions"]:[]) &&
+ isempty(disk["used_by"]:[]))
{
return `show;
}
@@ -31,8 +31,8 @@
else
{
if (partition["type"]:`primary != `extended &&
- partition["mount"]:"" == "" &&
- partition["used_by_type"]:`UB_NONE == `UB_NONE)
+ isempty(partition["mount"]:"") &&
+ isempty(partition["used_by"]:[]))
{
return `show;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/storage/src/inst_prepdisk.ycp
new/yast2-storage-2.19.4/storage/src/inst_prepdisk.ycp
--- old/yast2-storage-2.19.3/storage/src/inst_prepdisk.ycp 2009-07-31
11:36:31.000000000 +0200
+++ new/yast2-storage-2.19.4/storage/src/inst_prepdisk.ycp 2010-01-14
17:45:15.000000000 +0100
@@ -118,20 +118,7 @@
integer ret = Storage::CommitChanges();
y2milestone( "CommitChanges ret:%1", ret );
if( ret!=0 )
- {
- string txt = sformat(_("Failure occurred during following action:
-%2
-
-System error code was: %1
-"), ret, Storage::LastAction() );
- string ext = Storage::ExtendedErrorMsg();
- if( size(ext)>0 )
- {
- txt = txt + "\n\n" + ext;
- }
- Popup::Error( txt );
ret_val = `abort;
- }
//mount proc and usbfs during installation
if( Stage::initial() )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/storage/src/modules/FileSystems.ycp
new/yast2-storage-2.19.4/storage/src/modules/FileSystems.ycp
--- old/yast2-storage-2.19.3/storage/src/modules/FileSystems.ycp
2009-08-12 17:27:17.000000000 +0200
+++ new/yast2-storage-2.19.4/storage/src/modules/FileSystems.ycp
2010-01-18 18:11:32.000000000 +0100
@@ -8,7 +8,7 @@
* These module contains the supported filesystems and their settings.
*
*
- * $Id: FileSystems.ycp 58331 2009-08-12 14:12:53Z aschnell $
+ * $Id: FileSystems.ycp 60440 2010-01-18 17:11:31Z aschnell $
*/
{
module "FileSystems";
@@ -44,6 +44,7 @@
LibStorage::NTFS() : `ntfs,
LibStorage::SWAP() : `swap,
LibStorage::NFS() : `nfs,
+ LibStorage::NFS4() : `nfs4,
LibStorage::FSNONE() : `none
]
];
@@ -959,14 +960,18 @@
}
}
- global define string GetName( symbol used_fs, string defaultv )``{
+
+ global string GetName( symbol used_fs, string defaultv )
+ {
map<symbol,any> fsmap = GetFsMap( used_fs);
string ret = fsmap[`name]:"";
if ( ret == "" && used_fs == `ntfs ) ret = "NTFS"; // obsolete?
(included in RealFileSystems)
- if ( ret == "" && used_fs == `nfs ) ret = "NFS";
+ if ( ret == "" && used_fs == `nfs ) ret = "NFS";
+ if ( ret == "" && used_fs == `nfs4 ) ret = "NFS4";
if ( ret == "" ) ret = defaultv;
return ret;
- }
+ }
+
global define integer GetFsid( symbol used_fs )``{
map<symbol,any> fsmap = GetFsMap( used_fs);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/storage/src/modules/Storage.ycp
new/yast2-storage-2.19.4/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.19.3/storage/src/modules/Storage.ycp 2010-01-14
10:58:09.000000000 +0100
+++ new/yast2-storage-2.19.4/storage/src/modules/Storage.ycp 2010-01-21
17:32:04.000000000 +0100
@@ -19,7 +19,7 @@
* wurde versucht "intelligent" zu gestallten und ist im einzelen bei den
* entspechenden Funktionen n�her erkl�rt.
*
- * $Id: Storage.ycp 60355 2010-01-14 09:58:08Z aschnell $
+ * $Id: Storage.ycp 60473 2010-01-21 16:32:04Z aschnell $
*/
{
module "Storage";
@@ -2153,6 +2153,7 @@
return( ret==0 );
}
+
global boolean UpdatePartition( string device, integer start, integer len )
{
y2milestone( "UpdatePartition device:%1 start:%2 len:%3",
@@ -2599,27 +2600,25 @@
return( ret==0 );
}
-global boolean AddNfsVolume( string nfsdev, string opts, integer sz, string mp
)
+global boolean AddNfsVolume( string nfsdev, string opts, integer sz, string
mp, boolean nfs4 )
{
- y2milestone( "AddNfsVolume dev:%1 opts:%2 size:%3 mp:%4", nfsdev, opts,
- sz, mp );
+ y2milestone("AddNfsVolume dev:%1 opts:%2 size:%3 mp:%4 nfs4:%5", nfsdev,
opts, sz, mp, nfs4);
integer ret = 0;
string dummy = "";
- ret = LibStorage::StorageInterface::addNfsDevice( sint, nfsdev, opts, sz,
mp );
+ ret = LibStorage::StorageInterface::addNfsDevice(sint, nfsdev, opts, sz,
mp, nfs4);
if( ret<0 )
y2error( "AddNfsVolume sint ret:%1", ret );
UpdateTargetMapDisk( "/dev/nfs" );
return( ret==0 );
}
-global integer CheckNfsVolume( string nfsdev, string opts )
+global integer CheckNfsVolume(string nfsdev, string opts, boolean nfs4)
{
- y2milestone( "CheckNfsVolume dev:%1 opts:%2", nfsdev, opts );
+ y2milestone("CheckNfsVolume dev:%1 opts:%2 nfs4:%3", nfsdev, opts, nfs4);
integer ret = 0;
integer sz = 0;
string dummy = "";
- ret = LibStorage::StorageInterface::checkNfsDevice( sint, nfsdev, opts,
- sz );
+ ret = LibStorage::StorageInterface::checkNfsDevice(sint, nfsdev, opts,
nfs4, sz);
if( ret<0 )
y2error( "CheckNfsVolume sint ret:%1", ret );
else
@@ -2973,8 +2972,8 @@
}
else if( ctype == `CT_NFS )
{
- ret = Storage::AddNfsVolume( p["device"]:"", p["fstopt"]:"",
- p["size_k"]:0, p["mount"]:"" );
+ ret = Storage::AddNfsVolume( p["device"]:"", p["fstopt"]:"",
p["size_k"]:0,
+ p["mount"]:"", p["used_fs"]:`nfs == `nfs4
);
}
y2milestone( "CreateAny ret:%1", ret );
return( ret );
@@ -4373,8 +4372,8 @@
global define map IsResizable( map part )
``{
map ret = FileSystems::IsResizable(`unknown);
- if( !Arch::s390 () &&
- (part["type"]:`none==`lvm || Partitions::IsResizable( part["fsid"]:0
)))
+ if ((!Arch::s390() && Partitions::IsResizable(part["fsid"]:0)) ||
+ part["type"]:`none == `lvm)
{
if( part["fsid"]:0==Partitions::fsid_swap )
{
@@ -4390,31 +4389,14 @@
}
-global integer FreeCylindersAfterPartition(string device)
+global boolean FreeCylindersAroundPartition(string device, integer&
free_before, integer& free_after)
{
- integer ret = 0;
- if (LibStorage::StorageInterface::freeCylindersAfterPartition(sint,
device, ret) != 0)
- ret = 0;
- y2milestone("FreeCylindersAfterPartition ret:%1", ret);
+ boolean ret =
LibStorage::StorageInterface::freeCylindersAroundPartition(sint, device,
free_before, free_after) == 0;
+ y2milestone("FreeCylindersAfterPartition ret:%1 free_before:%2
free_after:%3", ret, free_before, free_after);
return ret;
}
-global define boolean CheckNextCreated( map disk, list region )
- ``{
- boolean ret = false;
- integer cylinder = region[0]:0 + region[1]:0;
- foreach(map part, disk["partitions"]:[], ``{
- if( part["region",0]:0 == cylinder && part["create"]:false )
- {
- ret = true;
- }
- });
- y2milestone( "CheckNextCreated region:%1 ret:%2", region, ret );
- return( ret );
- }
-
-
global string PathToDestdir(string p)
{
if (Installation::scr_destdir != "/")
@@ -5015,125 +4997,6 @@
}
-global define void AdaptResize( string maindev, list region, integer schange )
- ``{
- map<string,map> tg = GetTargetMap();
- list<map> partitions = tg[maindev,"partitions"]:[];
- integer cylinder = region[0]:0 + region[1]:0;
- boolean found = false;
- integer index = -1;
- integer e_idx = -1;
- list<integer> idx_list = [];
- map part = (map) find(map p, partitions,
- ``(p["region",0]:0 == cylinder &&
p["create"]:false));
- y2milestone( "AdaptResize %1 reg %2 change %3", maindev, region, schange );
- if( part != nil )
- {
- found = false;
- index = 0;
- foreach(map p, partitions,
- ``{
- if( p["region",0]:0 == cylinder && p["create"]:false )
- {
- found = true;
- }
- else if( !found )
- {
- index = index + 1;
- }
- });
- if( partitions[index,"type"]:`primary == `extended )
- {
- e_idx = index;
- found = false;
- index = 0;
- foreach(map p, partitions,
- ``{
- if( p["region",0]:0 == cylinder && p["create"]:false &&
- p["type"]:`primary != `extended )
- {
- found = true;
- part = p;
- }
- else if( !found )
- {
- index = index + 1;
- }
- });
- }
- cylinder = part["region",0]:0 + part["region",1]:0;
- y2milestone( "AdaptResize part:%1", part );
- y2milestone( "AdaptResize index:%1 e_idx:%2 cylinder:%3", index, e_idx,
- cylinder );
- map pnew = (map) find( map p, partitions,
- ``( p["region",0]:0 == cylinder &&
- p["create"]:false ));
- y2milestone( "AdaptResize pnew:%1", pnew );
- while( pnew != nil &&
- (part["mount"]:"" == Partitions::BootMount() ||
- part["fsid"]:0==Partitions::fsid_swap ||
- part["region",1]:0 < (schange<0?(-1*schange):schange)) )
- {
- y2milestone( "AdaptResize pnew:%1", pnew );
- part = pnew;
- idx_list = add( idx_list, index );
- y2milestone( "AdaptResize index:%1 idx_list:%2", index, idx_list );
- found = false;
- index = 0;
- foreach(map p, partitions, ``{
- y2milestone( "found:%1 index:%2 p=%3", found, index, p );
- if( p["nr"]:0 == pnew["nr"]:0 )
- {
- found = true;
- }
- else if( !found )
- {
- index = index + 1;
- }
- });
- cylinder = part["region",0]:0 + part["region",1]:0;
- pnew = (map) find( map p, partitions,
- ``( p["region",0]:0 == cylinder &&
- p["create"]:false ));
- }
- y2milestone( "AdaptResize idx:%1 list:%2", index, idx_list );
-
- foreach(integer num, idx_list, ``{
- partitions[num,"region",0] = partitions[num,"region",0]:0 - schange;
- UpdatePartition( partitions[num,"device"]:"",
partitions[num,"region",0]:0,
- partitions[num,"region",1]:1 );
- });
- partitions[index,"region",0] = partitions[index,"region",0]:0 - schange;
- partitions[index,"region",1] = partitions[index,"region",1]:0 + schange;
- if( partitions[index,"region",1]:0 <= 0 )
- {
- partitions[index,"region",1] = 1;
- }
- y2milestone( "AdaptResize increase p:%1", partitions[index]:$[] );
- UpdatePartition( partitions[index,"device"]:"",
partitions[index,"region",0]:0,
- partitions[index,"region",1]:1 );
- if( e_idx>=0 )
- {
- partitions[e_idx,"region",0] = partitions[e_idx,"region",0]:0 -
schange;
- partitions[e_idx,"region",1] = partitions[e_idx,"region",1]:0 +
schange;
- if( partitions[e_idx,"region",1]:0 <= 0 )
- {
- partitions[e_idx,"region",1] = 1;
- }
- UpdatePartition( partitions[e_idx,"device"]:"",
partitions[e_idx,"region",0]:0,
- partitions[e_idx,"region",1]:1 );
- }
- }
- else
- {
- y2error( "AdaptResize this should not happen %1", partitions );
- }
- y2milestone( "AdaptResize partitions:%1", partitions );
- y2milestone( "AdaptResize maindev:%1 region:%2 change:%3", maindev,
- region, schange );
- }
-
-
global define integer NumLoopDevices()
{
map bo = (map)WFM::Execute (.local.bash_output, "losetup -a" );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-storage-2.19.3/storage/src/modules/StorageClients.ycp
new/yast2-storage-2.19.4/storage/src/modules/StorageClients.ycp
--- old/yast2-storage-2.19.3/storage/src/modules/StorageClients.ycp
2010-01-04 17:12:59.000000000 +0100
+++ new/yast2-storage-2.19.4/storage/src/modules/StorageClients.ycp
2010-01-18 11:50:17.000000000 +0100
@@ -15,8 +15,15 @@
import "SlideShow";
import "StorageCallbacks";
+ import "LibStorage";
+ import "LibStorage::StorageInterface";
+
textdomain "storage";
+
+ any sint = nil;
+
+
boolean enable_popup = false;
list<string> texts = [];
@@ -77,6 +84,33 @@
}
+ global boolean CommitErrorPopup(integer error, string last_action, string
extended_message)
+ {
+ y2milestone("CommitErrorPopup error%1 last_action%2
extended_message:%3", error,
+ last_action, extended_message);
+
+ string text = _("Failure occurred during following action:") + "\n" +
last_action + "\n\n";
+
+ string tmp = LibStorage::StorageInterface::getErrorString(sint, error);
+ if (!isempty(tmp))
+ {
+ text = text + tmp + "\n\n";
+ }
+
+ text = text + sformat(_("System error code was: %1"), error) + "\n\n";
+
+ if (!isempty(extended_message))
+ {
+ text = text + extended_message + "\n\n";
+ }
+
+ text = text + _("Continue despite the error?");
+
+ return Report::ErrorAnyQuestion(Popup::NoHeadline(), text,
Label::ContinueButton(),
+ Label::AbortButton(), `focus_no);
+ }
+
+
global list<any> PasswordPopup(string device, integer attempts, string
password)
{
y2milestone("PasswordPopup device:%1 attempts:%2", device, attempts);
@@ -110,13 +144,17 @@
}
-global void InstallCallbacks(any sint)
+global void InstallCallbacks(any value)
{
y2milestone( "InstallCallbacks" );
+
+ sint = value;
+
StorageCallbacks::ProgressBar("StorageClients::ProgressBar");
StorageCallbacks::ShowInstallInfo("StorageClients::ShowInstallInfo");
StorageCallbacks::InfoPopup("StorageClients::InfoPopup");
StorageCallbacks::YesNoPopup("StorageClients::YesNoPopup");
+ StorageCallbacks::CommitErrorPopup("StorageClients::CommitErrorPopup");
StorageCallbacks::PasswordPopup("StorageClients::PasswordPopup");
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |