Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at Thu Aug 13 18:17:00 CEST 2009.
--------
--- yast2-storage/yast2-storage.changes 2009-08-04 15:28:37.000000000 +0200
+++ yast2-storage/yast2-storage.changes 2009-08-11 13:38:42.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Aug 11 13:20:51 CEST 2009 - aschnell@suse.de
+
+- use new getPartitionPrefix() from libstorage
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.gUu6ls/_old 2009-08-13 18:16:12.000000000 +0200
+++ /var/tmp/diff_new_pack.gUu6ls/_new 2009-08-13 18:16:12.000000000 +0200
@@ -20,7 +20,7 @@
Name: yast2-storage
Version: 2.18.18
-Release: 2
+Release: 3
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-storage-2.18.18.tar.bz2
Prefix: /usr
@@ -28,7 +28,7 @@
License: GPL v2 or later
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.18.18 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools
+BuildRequires: libstorage-devel >= 2.18.21 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools
BuildRequires: yast2-perl-bindings yast2-testsuite
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
++++++ yast2-storage-2.18.18.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.18/storage/src/include/ep-lib.ycp new/yast2-storage-2.18.18/storage/src/include/ep-lib.ycp
--- old/yast2-storage-2.18.18/storage/src/include/ep-lib.ycp 2009-07-24 11:05:42.000000000 +0200
+++ new/yast2-storage-2.18.18/storage/src/include/ep-lib.ycp 2009-08-05 17:35:33.000000000 +0200
@@ -410,4 +410,21 @@
return `BarGraph(bits, labels);
}
+
+
+ string CompleteSummary()
+ {
+ string part_summary = Storage::ChangeText();
+ if (isempty(part_summary))
+ part_summary = HTML::Heading(_("<p>No changes to partitioning.</p>"));
+ else
+ part_summary = HTML::Heading(_("<p>Changes to partitioning:</p>")) + part_summary;
+
+ string config_summary = HTML::Heading(_("<p>No changes to storage settings.</p>"));
+ if (StorageSettings::GetModified())
+ config_summary = HTML::Heading(_("<p>Storage settings:</p>")) + StorageSettings::Summary();
+
+ return part_summary + config_summary;
+ }
+
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.18/storage/src/include/ep-main.ycp new/yast2-storage-2.18.18/storage/src/include/ep-main.ycp
--- old/yast2-storage-2.18.18/storage/src/include/ep-main.ycp 2009-07-27 16:32:50.000000000 +0200
+++ new/yast2-storage-2.18.18/storage/src/include/ep-main.ycp 2009-08-05 17:33:01.000000000 +0200
@@ -32,6 +32,7 @@
import "Region";
import "ProductFeatures";
import "Directory";
+ import "HTML";
include "partitioning/lvm_ui_dialogs.ycp";
include "partitioning/raid_lib.ycp";
@@ -305,21 +306,14 @@
symbol SummaryDialog()
{
symbol ret = `none;
- string summary = Storage::ChangeText() +
- ( StorageSettings::GetModified() ?
- StorageSettings::Summary() :
- "");
-
- y2milestone("Summary of changes: %1", summary);
Wizard::CreateDialog();
Wizard::SetContentsButtons(caption + _(": Summary"),
- `VBox(`RichText( `id(`summary), _("Creating summary ..."))),
+ `VBox(`RichText(CompleteSummary())),
SummaryDialogHelptext(),
Label::BackButton(),
Label::FinishButton());
Wizard::SetDesktopIcon("disk");
- UI::ChangeWidget(`id(`summary), `Value, _("<h1>Changes in Partitioning</h1>") + summary);
while (true)
{
@@ -327,6 +321,7 @@
if (ret == `next || ret == `back)
break;
+
if( ret == `abort && ReallyQuit( Label::AbortButton() ))
{
ret =`abort;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.18/storage/src/include/ep-summary.ycp new/yast2-storage-2.18.18/storage/src/include/ep-summary.ycp
--- old/yast2-storage-2.18.18/storage/src/include/ep-summary.ycp 2009-07-29 15:04:37.000000000 +0200
+++ new/yast2-storage-2.18.18/storage/src/include/ep-summary.ycp 2009-08-05 17:35:08.000000000 +0200
@@ -10,27 +10,14 @@
textdomain "storage";
- import "HTML";
-
-
void CreateSummaryPanel(any user_data)
{
- string part_summary = Storage::ChangeText();
- if (isempty(part_summary))
- part_summary = HTML::Heading(_("<p>No changes to partitioning.</p>"));
- else
- part_summary = HTML::Heading(_("<p>Changes to partitioning:</p>")) + part_summary;
-
- string config_summary = HTML::Heading(_("<p>No changes to storage settings.</p>"));
- if (StorageSettings::GetModified())
- config_summary = HTML::Heading(_("<p>Storage settings:</p>")) + StorageSettings::Summary();
-
UI::ReplaceWidget(`tree_panel,
Greasemonkey::Transform(
`VBox(
// dialog heading
`IconAndHeading(_("Installation Summary"), StorageIcons::summary_icon),
- `RichText(`id(`summary), part_summary + config_summary)
+ `RichText(CompleteSummary())
))
);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.18/storage/src/modules/Storage.ycp new/yast2-storage-2.18.18/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.18.18/storage/src/modules/Storage.ycp 2009-08-04 15:04:43.000000000 +0200
+++ new/yast2-storage-2.18.18/storage/src/modules/Storage.ycp 2009-08-11 13:35:57.000000000 +0200
@@ -19,7 +19,7 @@
* wurde versucht "intelligent" zu gestallten und ist im einzelen bei den
* entspechenden Funktionen n�her erkl�rt.
*
- * $Id: Storage.ycp 58262 2009-08-03 14:58:29Z aschnell $
+ * $Id: Storage.ycp 58317 2009-08-11 11:35:58Z aschnell $
*/
{
module "Storage";
@@ -591,11 +591,7 @@
{
dlen = 12;
}
- else if( search( device, "/dev/rd/" )==0 ||
- search( device, "/dev/cciss/" )==0 ||
- search( device, "/dev/ataraid/" )==0 ||
- search( device, "/dev/etherd/" )==0 ||
- search( device, "/dev/ida/" )==0 )
+ else if(LibStorage::StorageInterface::getPartitionPrefix(sint, device) == "p")
{
integer pos = findlastof( device, "p" );
dlen = size(device);
@@ -1977,7 +1973,7 @@
if( Stage::initial() )
{
string inst = (string) SCR::Read( .etc.install_inf.Partition );
- if( inst!=nil && size(inst)>0 )
+ if (inst != nil && !isempty(inst))
{
part_insts = "/dev/" + inst;
y2milestone( "Storage .etc.install_inf.Partition \"%1\" part_insts:%2",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.18/storage/src/modules/StorageProposal.ycp new/yast2-storage-2.18.18/storage/src/modules/StorageProposal.ycp
--- old/yast2-storage-2.18.18/storage/src/modules/StorageProposal.ycp 2009-08-04 15:07:59.000000000 +0200
+++ new/yast2-storage-2.18.18/storage/src/modules/StorageProposal.ycp 2009-08-05 12:45:19.000000000 +0200
@@ -24,6 +24,7 @@
import "Arch";
import "Stage";
+
map read_partition_config( string fpath );
map read_partition_xml_config();
map get_gap_info( map disk, boolean add_exist_linux );
@@ -171,7 +172,7 @@
}
- global map EncryptDevices(map target, string vg)
+ map EncryptDevices(map target, string vg)
{
if (!GetProposalLvm() || !GetProposalEncrypt())
return target;
@@ -248,8 +249,8 @@
}
-define boolean ignore_disk( string dev, map entry, boolean soft )
- ``{
+ boolean ignore_disk(string dev, map entry, boolean soft)
+ {
boolean ret = !Storage::IsPartitionable( entry ) ||
entry["readonly"]:false || Arch::s390();
if( !ret && (Partitions::EfiBoot() || Arch::ia64()) && entry["label"]:"gpt"!="gpt" )
@@ -277,13 +278,14 @@
y2milestone( "ignoring disk %1 soft:%2", dev, soft );
}
return( ret );
- };
+ }
-map swapable = $[];
+map swapable = $[];
-global void flex_init_swapable( map tg )
-{
+
+ global void flex_init_swapable(map tg)
+ {
swapable = $[];
list swaps = Storage::SwappingPartitions();
foreach(string dev, map disk, tg, {
@@ -301,21 +303,23 @@
}
});
y2milestone("flex_init_swapable %1", swapable);
-}
+ }
-define boolean check_swapable( string dev )
+ boolean check_swapable(string dev)
{
- return( swapable[dev]:false );
+ return swapable[dev]:false;
}
-
-define string pinfo_name()
- ``{
- return( "/part.info" );
+
+
+ string pinfo_name()
+ {
+ return "/part.info";
}
+
global boolean has_flex_proposal()
- ``{
+ {
boolean ret = (integer)SCR::Read( .target.size, pinfo_name() )>0;
if( !ret )
{
@@ -329,14 +333,16 @@
return( ret );
}
+
boolean need_boot( map disk )
{
return( Partitions::NeedBoot() ||
disk["type"]:`CT_UNKNOWN == `CT_DMRAID );
}
-define map try_add_boot( map conf, map disk, boolean force )
- ``{
+
+map try_add_boot( map conf, map disk, boolean force )
+ {
boolean boot =
size(filter( map e, conf["partitions"]:[],
``(e["mount"]:""==Partitions::BootMount()))) > 0;
@@ -366,12 +372,13 @@
return( tc );
}
-global map do_flexible_disk( map disk )
- ``{
+
+global map do_flexible_disk(map disk)
+ {
string dev = disk["device"]:"";
y2milestone( "do_flexible_disk dev %1", dev );
y2milestone( "do_flexible_disk parts %1", disk["partitions"]:[] );
- map ret = $[];
+ map ret = $[];
ret["ok"] = false;
map conf = read_partition_config( pinfo_name() );
map solutions = $[];
@@ -402,9 +409,10 @@
return( ret );
}
-define map do_flexible_disk_conf( map disk, map co, boolean ignore_boot,
+
+map do_flexible_disk_conf( map disk, map co, boolean ignore_boot,
boolean reuse )
- ``{
+ {
string dev = disk["device"]:"";
y2milestone( "do_flexible_disk_conf dev %1 ignore_boot %2 reuse %3",
dev, ignore_boot, reuse );
@@ -448,8 +456,9 @@
return( ret );
}
-define map do_vm_disk_conf( map disk, map boot, string vmkey, string key )
- ``{
+
+map do_vm_disk_conf( map disk, map boot, string vmkey, string key )
+ {
string dev = disk["device"]:"";
y2milestone( "do_vm_disk_conf dev %1 vmkey %2 key %3 boot %4",
dev, vmkey, key, boot );
@@ -711,9 +720,9 @@
}
-define map do_pflex( map target, map conf )
+ map do_pflex(map target, map conf)
{
- map ret = $[];
+ map ret = $[];
ret["ok"] = false;
list<map> solutions = [];
cur_mode = `free;
@@ -846,8 +855,8 @@
}
-define map do_proposal_flexible( map target )
- ``{
+ map do_proposal_flexible(map target)
+ {
map conf = $[];
if( ProductFeatures::GetBooleanFeature( "partitioning",
"use_flexible_partitioning"))
@@ -858,8 +867,9 @@
return( do_pflex( target, conf ) );
}
-define map find_matching_disk( list<string> disks, map target, map conf )
- ``{
+
+map find_matching_disk( list<string> disks, map target, map conf )
+ {
map solutions = $[];
cur_weight = -100000;
@@ -947,8 +957,9 @@
return( ret );
}
-define map process_partition_data( string dev, map solution, string vgname )
- ``{
+
+map process_partition_data( string dev, map solution, string vgname )
+ {
map disk = solution["disk"]:$[];
list<map> partitions = [];
string value = "";
@@ -1200,8 +1211,9 @@
return( disk );
}
-define map add_cylinder_info( map conf, map gap )
- ``{
+
+map add_cylinder_info( map conf, map gap )
+ {
integer cyl_size = gap["cyl_size"]:1;
conf["partitions"] =
sort( map a, map b, conf["partitions"]:[],
@@ -1270,8 +1282,9 @@
return( conf );
}
-define map get_perfect_list( list ps, map g )
- ``{
+
+map get_perfect_list( list ps, map g )
+ {
y2milestone( "get_perfect_list ps %1", ps );
y2milestone( "get_perfect_list gap %1", g );
if( size(g["gap"]:[])>0 &&
@@ -1325,8 +1338,9 @@
return( ret );
}
-define void add_part_recursive( list ps, map g )
- ``{
+
+void add_part_recursive( list ps, map g )
+ {
y2milestone( "add_part_recursive pindex %1", g["procpart"]:0 );
y2milestone( "add_part_recursive ps %1", ps );
y2milestone( "add_part_recursive gap %1", g );
@@ -1406,8 +1420,9 @@
});
};
-define map normalize_gaps( list ps, map g )
- ``{
+
+map normalize_gaps( list ps, map g )
+ {
y2milestone( "normalize_gaps gap %1", g );
integer gindex = 0;
integer pindex = 0;
@@ -1606,8 +1621,8 @@
};
-define map distribute_space( integer rest, list weights, list added, list ps )
- ``{
+map distribute_space( integer rest, list weights, list added, list ps )
+ {
integer diff_sum = 0;
integer sum = 0;
integer index = 0;
@@ -1668,8 +1683,8 @@
}
-define integer do_weighting( list ps, map g )
- ``{
+integer do_weighting( list ps, map g )
+ {
y2milestone( "do_weighting gap %1", g["gap"]:[] );
integer ret = 0;
integer index = 0;
@@ -1758,7 +1773,8 @@
});
y2milestone( "do_weighting ret %1", ret );
return( ret );
- };
+ }
+
global list<map> try_remove_sole_extended( list<map> parts )
{
@@ -1781,8 +1797,9 @@
return( ret );
}
-define map remove_possible_partitions( map disk, map conf )
- ``{
+
+map remove_possible_partitions( map disk, map conf )
+ {
map ret = (map)eval(disk);
ret["partitions"] = maplist( map p, ret["partitions"]:[],
``{
@@ -1801,10 +1818,11 @@
});
ret["partitions"] = try_remove_sole_extended( ret["partitions"]:[] );
return( ret );
- };
+ }
+
-define map try_resize_windows( map disk )
- ``{
+map try_resize_windows( map disk )
+ {
integer cyl_size = disk["cyl_size"]:1;
map win = $[];
map ret = (map)eval(disk);
@@ -1830,11 +1848,12 @@
return( p );
});
return( ret );
- };
+ }
+
-define list<map> get_gaps( integer start, integer end, list<map> part,
+list<map> get_gaps( integer start, integer end, list<map> part,
boolean add_exist_linux )
- ``{
+ {
y2milestone( "get_gaps start %1 end %2 add_exist %3", start, end,
add_exist_linux );
list<map> ret = [];
@@ -1875,8 +1894,8 @@
}
-define map get_gap_info( map disk, boolean add_exist_linux )
- ``{
+map get_gap_info( map disk, boolean add_exist_linux )
+ {
map ret = $[];
list<map> gap = [];
list<map> plist = filter( map p, disk["partitions"]:[],
@@ -1980,13 +1999,13 @@
return( ret );
}
+
/**
* Read partition data from XML control file
- * @return map flexible propsal map
+ * @return map flexible proposal map
*/
-define map read_partition_xml_config()
- ``{
-
+map read_partition_xml_config()
+ {
map xmlflex = (map)ProductFeatures::GetFeature ("partitioning", "flexible_partitioning");
y2milestone("xml input: %1", xmlflex );
@@ -2134,8 +2153,8 @@
}
-define map read_partition_config( string fpath )
- ``{
+map read_partition_config( string fpath )
+ {
integer pos = 0;
string line = "";
string rex = "";
@@ -2350,6 +2369,7 @@
return( conf );
}
+
global map can_swap_reuse( string disk, list<map> partitions, map tgmap )
{
map ret = $[];
@@ -2416,6 +2436,7 @@
return( ret );
}
+
list<map> can_boot_reuse( string disk, string label, boolean boot,
integer max_prim, list<map> partitions )
{
@@ -2459,6 +2480,7 @@
return( ret );
}
+
list<map> can_mp_reuse( string mp, integer min, integer max,
list<map> partitions )
{
@@ -2497,6 +2519,7 @@
return( ret );
}
+
integer get_avail_size_mb( list<map> parts )
{
integer ret = 0;
@@ -2509,13 +2532,15 @@
return( ret );
}
-list get_swap_sizes( integer space )
+
+ list<integer> get_swap_sizes(integer space)
{
- list l = [ Partitions::SwapSizeMb(0), Partitions::SwapSizeMb(space) ];
- y2milestone( "get_swap_sizes space %1 ret %2", space, l );
- return( l );
+ list<integer> l = [ Partitions::SwapSizeMb(0), Partitions::SwapSizeMb(space) ];
+ y2milestone("get_swap_sizes space %1 ret %2", space, l);
+ return l;
}
+
global list<map> get_proposal( boolean have_swap, map disk )
{
list<map> ret = [];
@@ -2524,7 +2549,7 @@
"fsys" : Partitions::DefaultFs(), "size" : 0 ];
map opts = GetControlCfg();
map conf = $[ "partitions" : [] ];
- list swap_sizes = [];
+ list<integer> swap_sizes = [];
integer avail_size = get_avail_size_mb(disk["partitions"]:[]);
if( !have_swap )
{
@@ -2593,6 +2618,7 @@
return ret;
}
+
integer get_usable_size_mb( map disk, boolean reuse_linux )
{
integer ret = 0;
@@ -2620,6 +2646,7 @@
return( ret );
}
+
integer get_mb_sol( map sol, string mp )
{
map pa = find( map p, sol["disk","partitions"]:[], ``(p["mount"]:""==mp));
@@ -2629,6 +2656,7 @@
return( ret );
}
+
integer get_vm_sol( map sol )
{
integer ret = 0;
@@ -2641,6 +2669,7 @@
return( ret );
}
+
list<map> special_boot_proposal_prepare( list<map> partitions )
{
list<map> ret = partitions;
@@ -2659,6 +2688,7 @@
return( ret );
}
+
map prepare_part_lists( list<string> ddev, map tg )
{
list linux_pid = [ Partitions::fsid_native, Partitions::fsid_swap,
@@ -2684,6 +2714,7 @@
return( tg );
}
+
list<string> get_disk_try_list( map tg, boolean soft )
{
list<string> ret = [];
@@ -2699,6 +2730,7 @@
return( ret );
}
+
boolean usable_for_win_resize( map p, boolean assert_cons_fs )
{
boolean ret = Partitions::IsDosWinNtPartition( p["fsid"]:0 ) &&
@@ -2714,6 +2746,7 @@
return( ret );
}
+
list<map> remove_p_settings( list<map> parts, list<string> mp )
{
list<string> rems = [ "resize", "used_fs", "win_max_length", "mount",
@@ -2735,6 +2768,7 @@
return( parts );
}
+
list<map> remove_one_partition( map disk )
{
list<map> partitions = disk["partitions"]:[];
@@ -2768,6 +2802,7 @@
return( partitions );
}
+
list<map> remove_one_partition_vm( map disk )
{
list<map> partitions = disk["partitions"]:[];
@@ -2823,6 +2858,7 @@
return( partitions );
}
+
map remove_used_by( map tg, string disk )
{
string uby = tg[disk,"used_by_device"]:"";
@@ -2838,11 +2874,12 @@
return( tg );
}
-map get_inst_proposal( map target )
+
+ map get_inst_proposal(map target)
{
y2milestone( "get_inst_proposal start" );
flex_init_swapable( target );
- map ret = $[];
+ map ret = $[];
target = Storage::AddWinInfo(target);
ret["target"] = target;
map root = $[ "mount" : "/", "increasable" : true,
@@ -2997,7 +3034,7 @@
disk["partitions"] = r["partitions"]:[];
else if( haskey( r, "targets" ))
target = r["targets"]:$[];
- list swap_sizes = [];
+ list<integer> swap_sizes = [];
integer avail_size = get_usable_size_mb(disk,mode==`reuse);
y2milestone( "get_inst_proposal disk %1 mode %2 avail %3",
s, mode, avail_size );
@@ -3198,6 +3235,7 @@
return( ret );
}
+
list<map> remove_keys( list<map> pl, list<string> keys )
{
pl = maplist( map p, pl,
@@ -3212,6 +3250,7 @@
return( pl );
}
+
map remove_mount_points( map target )
{
foreach( string s, map disk, target,
@@ -3231,6 +3270,7 @@
return( target );
}
+
map remove_vm( map tg, string ky )
{
y2milestone( "remove_vm key:%1", ky );
@@ -3254,6 +3294,7 @@
return( tg );
}
+
string find_vm( map target, string ky, integer min_size )
{
string ret = "";
@@ -3265,6 +3306,7 @@
return( ret );
}
+
boolean did_remove_vg( list<map> partitions, string vg )
{
boolean ret=false;
@@ -3278,6 +3320,7 @@
return( ret );
}
+
integer sizek_to_pe( integer pek, integer pebyte, boolean pvcreate )
{
integer ret = (pek-(pvcreate?500:0)) / (pebyte/1024);
@@ -3286,6 +3329,7 @@
return( ret );
}
+
integer pe_to_sizek( integer pe, integer pebyte )
{
integer ret = pe * (pebyte/1024);
@@ -3293,6 +3337,7 @@
return( ret );
}
+
map extend_vm( map vg, string key, map disk )
{
y2milestone( "extend_vm key %1 vg %2", key, vg );
@@ -3316,6 +3361,7 @@
return( vg );
}
+
map create_vm( string key, map disk )
{
y2milestone("create_vm key:%1 disk:%2", key, disk);
@@ -3354,7 +3400,7 @@
integer free = ret["pe_free"]:0;
integer pe = ret["pesize"]:1024;
integer swsize = 0;
- list swlist = [];
+ list<integer> swlist = [];
if( need_swap )
{
swlist = get_swap_sizes( free );
@@ -3569,10 +3615,11 @@
return( ret );
}
-map get_inst_prop_vm( map target, string key )
+
+ map get_inst_prop_vm(map target, string key)
{
y2milestone( "get_inst_prop_vm start key %1", key );
- map ret = $[];
+ map ret = $[];
map opts = GetControlCfg();
string vg_key = find_vm( target, key, opts["root_base"]:0*1024 );
target = remove_mount_points(target);
@@ -3821,12 +3868,13 @@
return( ret );
}
-global map get_proposal_vm( map target, string key, map disk )
+
+ global map get_proposal_vm(map target, string key, map disk)
{
string ddev = disk["device"]:"";
y2milestone("get_proposal_vm ddev:%1 vg:%2 home:%3 lvm:%4 encrypt:%5", ddev,
key, GetProposalHome(), GetProposalLvm(), GetProposalEncrypt());
- map ret = $[];
+ map ret = $[];
map opts = GetControlCfg();
target = remove_mount_points(target);
target = remove_vm(target,key);
@@ -3878,13 +3926,14 @@
return ret;
}
-global map get_inst_prop( map target )
+
+ global map get_inst_prop(map target)
{
- map ret = $[];
+ map ret = $[];
string vg = GetProposalVM();
y2milestone("get_inst_prop vg:%1 home:%2 lvm:%3 encypt:%4", vg,
GetProposalHome(), GetProposalLvm(), GetProposalEncrypt());
- if( size(vg)==0 )
+ if (isempty(vg))
{
if( has_flex_proposal() )
ret = do_proposal_flexible( target );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.18/storage.pot new/yast2-storage-2.18.18/storage.pot
--- old/yast2-storage-2.18.18/storage.pot 2009-07-31 14:22:11.000000000 +0200
+++ new/yast2-storage-2.18.18/storage.pot 2009-08-05 18:01:13.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-31 14:22+0200\n"
+"POT-Creation-Date: 2009-08-05 18:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -32,7 +32,7 @@
#. dialog heading
#. dialog caption
-#: disk/src/disk.ycp:46 storage/src/include/ep-main.ycp:42
+#: disk/src/disk.ycp:46 storage/src/include/ep-main.ycp:43
msgid "Expert Partitioner"
msgstr ""
@@ -608,7 +608,7 @@
#. popup text
#: storage/src/include/custom_part_dialogs.ycp:314
-#: storage/src/modules/Storage.ycp:5414
+#: storage/src/modules/Storage.ycp:5402
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -616,7 +616,7 @@
#. popup text
#: storage/src/include/custom_part_dialogs.ycp:325
-#: storage/src/modules/Storage.ycp:5425
+#: storage/src/modules/Storage.ycp:5413
#, ycp-format
msgid ""
"The password must have at least %1 characters.\n"
@@ -1605,7 +1605,7 @@
#. dialog heading, graph is the mathematic term for
#. a set of notes connected with edges
#. tree node label
-#: storage/src/include/ep-graph.ycp:41 storage/src/include/ep-main.ycp:206
+#: storage/src/include/ep-graph.ycp:41 storage/src/include/ep-main.ycp:207
msgid "Graph"
msgstr ""
@@ -1839,7 +1839,7 @@
#. heading
#. tree node label
-#: storage/src/include/ep-hd.ycp:136 storage/src/include/ep-main.ycp:188
+#: storage/src/include/ep-hd.ycp:136 storage/src/include/ep-main.ycp:189
msgid "Hard Disks"
msgstr ""
@@ -2005,9 +2005,25 @@
msgid "Unallocated Space"
msgstr ""
+#: storage/src/include/ep-lib.ycp:419
+msgid "<p>No changes to partitioning.</p>"
+msgstr ""
+
+#: storage/src/include/ep-lib.ycp:421
+msgid "<p>Changes to partitioning:</p>"
+msgstr ""
+
+#: storage/src/include/ep-lib.ycp:423
+msgid "<p>No changes to storage settings.</p>"
+msgstr ""
+
+#: storage/src/include/ep-lib.ycp:425
+msgid "<p>Storage settings:</p>"
+msgstr ""
+
#. heading
#. tree node label
-#: storage/src/include/ep-log.ycp:23 storage/src/include/ep-main.ycp:216
+#: storage/src/include/ep-log.ycp:23 storage/src/include/ep-main.ycp:217
msgid "Log"
msgstr ""
@@ -2129,7 +2145,7 @@
#. heading
#. tree node label
-#: storage/src/include/ep-loop.ycp:80 storage/src/include/ep-main.ycp:194
+#: storage/src/include/ep-loop.ycp:80 storage/src/include/ep-main.ycp:195
msgid "Crypt Files"
msgstr ""
@@ -2386,7 +2402,7 @@
#. heading
#. tree node label
-#: storage/src/include/ep-lvm.ycp:155 storage/src/include/ep-main.ycp:192
+#: storage/src/include/ep-lvm.ycp:155 storage/src/include/ep-main.ycp:193
msgid "Volume Management"
msgstr ""
@@ -2449,40 +2465,40 @@
#. tree node label
#. heading
-#: storage/src/include/ep-main.ycp:190 storage/src/include/ep-raid.ycp:94
+#: storage/src/include/ep-main.ycp:191 storage/src/include/ep-raid.ycp:94
msgid "RAID"
msgstr ""
#. tree node label
-#: storage/src/include/ep-main.ycp:196
+#: storage/src/include/ep-main.ycp:197
msgid "Device Mapper"
msgstr ""
#. tree node label
-#: storage/src/include/ep-main.ycp:198
+#: storage/src/include/ep-main.ycp:199
msgid "NFS"
msgstr ""
#. tree node label
#. heading
-#: storage/src/include/ep-main.ycp:200 storage/src/include/ep-unused.ycp:56
+#: storage/src/include/ep-main.ycp:201 storage/src/include/ep-unused.ycp:56
msgid "Unused Devices"
msgstr ""
#. tree node label
#. dialog heading
-#: storage/src/include/ep-main.ycp:209 storage/src/include/ep-summary.ycp:32
+#: storage/src/include/ep-main.ycp:210 storage/src/include/ep-summary.ycp:19
msgid "Installation Summary"
msgstr ""
#. tree node label
#. dialog heading
-#: storage/src/include/ep-main.ycp:212 storage/src/include/ep-settings.ycp:79
+#: storage/src/include/ep-main.ycp:213 storage/src/include/ep-settings.ycp:79
msgid "Settings"
msgstr ""
#. popup text, %1 will be replaces with button text
-#: storage/src/include/ep-main.ycp:285
+#: storage/src/include/ep-main.ycp:286
#, ycp-format
msgid ""
"You have changed the partitioning or storage settings. These changes\n"
@@ -2491,24 +2507,16 @@
msgstr ""
#. helptext
-#: storage/src/include/ep-main.ycp:296
+#: storage/src/include/ep-main.ycp:297
msgid "<p>Here you can see the partitioning summary.</p>"
msgstr ""
-#: storage/src/include/ep-main.ycp:316
+#: storage/src/include/ep-main.ycp:311
msgid ": Summary"
msgstr ""
-#: storage/src/include/ep-main.ycp:317
-msgid "Creating summary ..."
-msgstr ""
-
-#: storage/src/include/ep-main.ycp:322
-msgid "<h1>Changes in Partitioning</h1>"
-msgstr ""
-
#. tree node label
-#: storage/src/include/ep-main.ycp:390
+#: storage/src/include/ep-main.ycp:385
msgid "System View"
msgstr ""
@@ -2886,24 +2894,8 @@
"Devices</b> allows to hide information in the tables and overview.</p>"
msgstr ""
-#: storage/src/include/ep-summary.ycp:20
-msgid "<p>No changes to partitioning.</p>"
-msgstr ""
-
-#: storage/src/include/ep-summary.ycp:22
-msgid "<p>Changes to partitioning:</p>"
-msgstr ""
-
-#: storage/src/include/ep-summary.ycp:24
-msgid "<p>No changes to storage settings.</p>"
-msgstr ""
-
-#: storage/src/include/ep-summary.ycp:26
-msgid "<p>Storage settings:</p>"
-msgstr ""
-
#. helptext
-#: storage/src/include/ep-summary.ycp:38
+#: storage/src/include/ep-summary.ycp:25
msgid "<p>This view show the installation summary.</p>"
msgstr ""
@@ -3884,7 +3876,7 @@
msgstr ""
#. popup text %1 is replaced by disk name e.g. /dev/hda
-#: storage/src/modules/Partitions.ycp:761
+#: storage/src/modules/Partitions.ycp:772
#, ycp-format
msgid ""
"\n"
@@ -3899,7 +3891,7 @@
msgstr ""
#. popup text
-#: storage/src/modules/Partitions.ycp:773
+#: storage/src/modules/Partitions.ycp:784
msgid ""
"\n"
"\n"
@@ -3910,7 +3902,7 @@
msgstr ""
#. popup text
-#: storage/src/modules/Partitions.ycp:784
+#: storage/src/modules/Partitions.ycp:795
msgid ""
"\n"
"\n"
@@ -3937,7 +3929,7 @@
msgid "Resize Not Possible:"
msgstr ""
-#: storage/src/modules/Storage.ycp:2281
+#: storage/src/modules/Storage.ycp:2269
#, ycp-format
msgid ""
"Could not set encryption.\n"
@@ -3946,7 +3938,7 @@
"The crypt password provided could be incorrect.\n"
msgstr ""
-#: storage/src/modules/Storage.ycp:3654
+#: storage/src/modules/Storage.ycp:3642
#, ycp-format
msgid ""
"\n"
@@ -3954,7 +3946,7 @@
"that is needed to run the installation.\n"
msgstr ""
-#: storage/src/modules/Storage.ycp:3667
+#: storage/src/modules/Storage.ycp:3655
#, ycp-format
msgid ""
"\n"
@@ -3962,7 +3954,7 @@
"data needed to perform the installation.\n"
msgstr ""
-#: storage/src/modules/Storage.ycp:3688
+#: storage/src/modules/Storage.ycp:3676
#, ycp-format
msgid ""
"\n"
@@ -3970,7 +3962,7 @@
"that is needed to run the installation.\n"
msgstr ""
-#: storage/src/modules/Storage.ycp:3695
+#: storage/src/modules/Storage.ycp:3683
#, ycp-format
msgid ""
"\n"
@@ -3978,7 +3970,7 @@
"data needed to perform the installation.\n"
msgstr ""
-#: storage/src/modules/Storage.ycp:3721
+#: storage/src/modules/Storage.ycp:3709
#, ycp-format
msgid ""
"\n"
@@ -3987,7 +3979,7 @@
"the installation.\n"
msgstr ""
-#: storage/src/modules/Storage.ycp:3729
+#: storage/src/modules/Storage.ycp:3717
#, ycp-format
msgid ""
"\n"
@@ -3995,13 +3987,13 @@
"device %2 which contains data needed to perform the installation.\n"
msgstr ""
-#: storage/src/modules/Storage.ycp:4337
+#: storage/src/modules/Storage.ycp:4325
#, ycp-format
msgid "Add the following resolvables failed: %1"
msgstr ""
#. popup text
-#: storage/src/modules/Storage.ycp:5403
+#: storage/src/modules/Storage.ycp:5391
msgid ""
"The first and the second version\n"
"of the password do not match.\n"
@@ -4009,7 +4001,7 @@
msgstr ""
#. popup text
-#: storage/src/modules/Storage.ycp:5435
+#: storage/src/modules/Storage.ycp:5423
msgid ""
"The password may only contain the following characters:\n"
"0..9, a..z, A..Z, and any of \"@#* ,.;:._-+!$%&/|?{[()]}^\\<>\".\n"
@@ -4601,8 +4593,8 @@
msgid "<p>The overview contains:</p>"
msgstr ""
-#: storage/src/modules/StorageProposal.ycp:2877
-#: storage/src/modules/StorageProposal.ycp:3619
+#: storage/src/modules/StorageProposal.ycp:2918
+#: storage/src/modules/StorageProposal.ycp:3670
msgid "Resize impossible due to inconsistent fs. Try checking fs under Windows."
msgstr ""
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org