Author: aschnell
Date: Thu Mar 26 17:34:43 2009
New Revision: 56434
URL: http://svn.opensuse.org/viewcvs/yast?rev=56434&view=rev
Log:
- use used_by_device instead of used_by
Modified:
trunk/storage/storage/src/include/ep-dm-lib.ycp
trunk/storage/storage/src/include/ep-hd-lib.ycp
trunk/storage/storage/src/include/ep-loop-lib.ycp
trunk/storage/storage/src/include/ep-lvm-dialogs.ycp
trunk/storage/storage/src/include/ep-lvm-lib.ycp
trunk/storage/storage/src/include/ep-raid-dialogs.ycp
trunk/storage/storage/src/include/ep-raid-lib.ycp
Modified: trunk/storage/storage/src/include/ep-dm-lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-dm-lib.ycp?rev=56434&r1=56433&r2=56434&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-dm-lib.ycp (original)
+++ trunk/storage/storage/src/include/ep-dm-lib.ycp Thu Mar 26 17:34:43 2009
@@ -20,7 +20,7 @@
map target_map = Storage::GetTargetMap();
map data = Storage::GetPartition(target_map, device);
- if (data["used_by"]:"" != "")
+ if (!isempty(data["used_by_device"]:""))
{
// error popup
Popup::Error(sformat(_("The DM %1 is in use. It cannot be
Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-hd-lib.ycp?rev=56434&r1=56433&r2=56434&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-hd-lib.ycp (original)
+++ trunk/storage/storage/src/include/ep-hd-lib.ycp Thu Mar 26 17:34:43 2009
@@ -20,7 +20,7 @@
map target_map = Storage::GetTargetMap();
map disk = target_map[disk_device]:$[];
- if (disk["used_by_device"]:"" != "")
+ if (!isempty(disk["used_by_device"]:""))
{
// error popup
Popup::Error(_("The disk is in use and cannot be modified."));
@@ -182,7 +182,7 @@
map target_map = Storage::GetTargetMap();
map disk = target_map[disk_device]:$[];
- if (disk["used_by_device"]:"" != "")
+ if (!isempty(disk["used_by_device"]:""))
{
// error popup
Popup::Error(_("The disk is in use and cannot be modified."));
@@ -238,7 +238,7 @@
map target_map = Storage::GetTargetMap();
map data = Storage::GetPartition(target_map, device);
- if (data["used_by"]:"" != "")
+ if (!isempty(data["used_by_device"]:""))
{
// error popup, %1 is replace by partition device name e.g. /dev/sdb1
Popup::Error(sformat(_("The partition %1 is in use. It cannot be
@@ -284,7 +284,7 @@
return;
}
- if (data["used_by"]:"" != "")
+ if (!isempty(data["used_by_device"]:""))
{
// error popup, %1 is replace by partition device name, e.g. /dev/sdb1
Popup::Error(sformat(_("The partition %1 is in use. It cannot be
Modified: trunk/storage/storage/src/include/ep-loop-lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-loop-lib.ycp?rev=56434&r1=56433&r2=56434&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-loop-lib.ycp (original)
+++ trunk/storage/storage/src/include/ep-loop-lib.ycp Thu Mar 26 17:34:43 2009
@@ -43,7 +43,7 @@
map target_map = Storage::GetTargetMap();
map data = Storage::GetPartition(target_map, device);
- if (data["used_by"]:"" != "")
+ if (!isempty(data["used_by_device"]:""))
{
// error popup, %1 is replaced by device name
Popup::Error(sformat(_("The Crypt File %1 is in use. It cannot be
Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lvm-dialogs.ycp?rev=56434&r1=56433&r2=56434&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-lvm-dialogs.ycp (original)
+++ trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Thu Mar 26 17:34:43 2009
@@ -200,7 +200,7 @@
list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, `type ]);
- list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by"]:"" == ""; });
+ list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return isempty(pv["used_by_device"]:""); });
term contents = `VBox();
Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lvm-lib.ycp?rev=56434&r1=56433&r2=56434&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original)
+++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Thu Mar 26 17:34:43 2009
@@ -40,7 +40,7 @@
void EpCreateVolumeGroup()
{
map target_map = Storage::GetTargetMap();
- list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return pv["used_by"]:"" == ""; });
+ list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return isempty(pv["used_by_device"]:""); });
if (size(unused_pvs) < 1)
{
Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-raid-dialogs.ycp?rev=56434&r1=56433&r2=56434&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-raid-dialogs.ycp (original)
+++ trunk/storage/storage/src/include/ep-raid-dialogs.ycp Thu Mar 26 17:34:43 2009
@@ -99,9 +99,9 @@
list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size, `type ]);
map target_map = Storage::GetTargetMap();
- list<map> unused_devices = filter(map dev, get_possible_rds(target_map), { return dev["used_by"]:"" == "" &&
+ list<map> unused_devices = filter(map dev, get_possible_rds(target_map), { return isempty(dev["used_by_device"]:"") &&
!contains(devices, dev["device"]:""); });
- list<map> used_devices = filter(map dev, get_possible_rds(target_map), { return dev["used_by"]:"" == "" &&
+ list<map> used_devices = filter(map dev, get_possible_rds(target_map), { return isempty(dev["used_by_device"]:"") &&
contains(devices, dev["device"]:""); });
term contents = `VBox(`Left(
Modified: trunk/storage/storage/src/include/ep-raid-lib.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-raid-lib.ycp?rev=56434&r1=56433&r2=56434&view=diff
==============================================================================
--- trunk/storage/storage/src/include/ep-raid-lib.ycp (original)
+++ trunk/storage/storage/src/include/ep-raid-lib.ycp Thu Mar 26 17:34:43 2009
@@ -40,7 +40,7 @@
void EpCreateRaid()
{
map target_map = Storage::GetTargetMap();
- list<map> unused_devices = filter(map dev, get_possible_rds(target_map), { return dev["used_by"]:"" == ""; });
+ list<map> unused_devices = filter(map dev, get_possible_rds(target_map), { return isempty(dev["used_by_device"]:""); });
if (size(unused_devices) < 2)
{
@@ -97,7 +97,7 @@
map target_map = Storage::GetTargetMap();
map data = Storage::GetPartition(target_map, device);
- if (data["used_by"]:"" != "")
+ if (!isempty(data["used_by_device"]:""))
{
// error popup, %1 is replaced by device name e.g. /dev/md1
Popup::Error(sformat(_("The RAID %1 is in use. It cannot be
@@ -137,7 +137,7 @@
return;
}
- if (data["used_by"]:"" != "")
+ if (!isempty(data["used_by_device"]:""))
{
// error popup, %1 is replaced by device name e.g. /dev/md1
Popup::Error(sformat(_("The RAID %1 is in use. It cannot be
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
