Mailinglist Archive: yast-commit (590 mails)

[aschnell@xxxxxxxxxxxxxxxx]

Author: aschnell
Date: Thu Apr 15 18:06:19 2010
New Revision: 61722

URL: http://svn.opensuse.org/viewcvs/yast?rev=61722&view=rev
Log:
- tiny improvements

Modified:
    trunk/storage/storage/src/include/custom_part_dialogs.ycp
    trunk/storage/storage/src/include/custom_part_lib.ycp

Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_dialogs.ycp?rev=61722&r1=61721&r2=61722&view=diff
==============================================================================
--- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original)
+++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Thu Apr 15 
18:06:19 2010
@@ -1172,7 +1172,7 @@
        }
 
     // heading text
-    term header = `header( _("Device      "),  _("Mount       "));
+    term header = `header(_("Device"), _("Mount Point"));
 
     // help text, richtext format
     string help_text = _("<P><B><BIG>Attention:</BIG></B><BR>YaST2 has scanned 
your hard disks and found an old Linux system
@@ -1191,7 +1191,7 @@
                       `HSpacing(3.0),
                       `VSpacing(8),
                       `VBox( `VSpacing(1),
-                              `Table(`id(`table), header, [] )
+                             `Table(`id(`table), `opt(`keepSorting), header, 
[])
                            ),
                       `HSpacing(3.0)
                       ),

Modified: trunk/storage/storage/src/include/custom_part_lib.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_lib.ycp?rev=61722&r1=61721&r2=61722&view=diff
==============================================================================
--- trunk/storage/storage/src/include/custom_part_lib.ycp (original)
+++ trunk/storage/storage/src/include/custom_part_lib.ycp Thu Apr 15 18:06:19 
2010
@@ -926,13 +926,14 @@
            ``{
            map new_partition = partition;
 
+           string device = partition["device"]:"";
+
            foreach( map fstab_entry, fstab,
                ``{
                string dev_fstab   = fstab_entry["device"]:"";
                string mount_fstab = fstab_entry["mount"]:"";
 
-               if (dev_fstab == partition["device"]:"" && 
-                   !Storage::IsInstallationSource(partition["device"]:""))
+               if (dev_fstab == device && 
!Storage::IsInstallationSource(device))
                {
                    new_partition["mount"] = mount_fstab;
                    if (format_sys && FileSystems::IsSystemMp(mount_fstab, 
false))
@@ -949,14 +950,12 @@
 
                    /////////////////////////////////////////////
                    // entries for table
-                   term a = `item(`id(dev_fstab));
-                   a = add( a, dev_fstab );
-                   a = add( a, mount_fstab );
                    if( mount_fstab=="/" )
                        {
                        table_input["root"] = dev_fstab;
                        }
-                   table_input["tbl"] = add( table_input["tbl"]:[], a );
+                   table_input["tbl"] = add(table_input["tbl"]:[],
+                                            `item(`id(dev_fstab), dev_fstab, 
mount_fstab));
                    }
                });
            new_partitions = add( new_partitions, new_partition);

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx