April 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r47243 - in /branches/tmp/coolo/update_yast_repo: last_rev_yast last_rev_zypp
by coolo＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: coolo Date: Thu May 1 00:10:35 2008 New Revision: 47243 URL: http://svn.opensuse.org/viewcvs/yast?rev=47243&view=rev Log: 80 or so Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast branches/tmp/coolo/update_yast_repo/last_rev_zypp Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_yast (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_yast Thu May 1 00:10:35 2008 @@ -1 +1 @@ -47183 +47243 Modified: branches/tmp/coolo/update_yast_repo/last_rev_zypp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_zypp (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_zypp Thu May 1 00:10:35 2008 @@ -1 +1 @@ -9891 +9925 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r47242 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes yast2-qt-pkg.spec.in
by sh-sh-sh＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: sh-sh-sh Date: Wed Apr 30 17:51:26 2008 New Revision: 47242 URL: http://svn.opensuse.org/viewcvs/yast?rev=47242&view=rev Log: new version for abuild Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/yast2-qt-pkg.spec.in Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=47242&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Wed Apr 30 17:51:26 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "39") +SET(VERSION_PATCH "40") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Wed Apr 30 17:51:26 2008 @@ -2,7 +2,8 @@ Wed Apr 30 15:21:09 CEST 2008 - lslezak(a)suse.cz - display "Repository" menu only when requested by `opt(`repoMgr) - opiton (bnc#381956) + option (bnc#381956) +- V 2.16.40 ------------------------------------------------------------------- Fri Apr 25 12:14:45 CEST 2008 - dmacvicar(a)suse.de Modified: trunk/qt-pkg/yast2-qt-pkg.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/yast2-qt-pkg.spec.in?rev=… ============================================================================== --- trunk/qt-pkg/yast2-qt-pkg.spec.in (original) +++ trunk/qt-pkg/yast2-qt-pkg.spec.in Wed Apr 30 17:51:26 2008 @@ -10,9 +10,9 @@ Requires: yast2-qt >= 2.16.25 BuildRequires: yast2-qt-devel >= 2.16.25 BuildRequires: libzypp-devel >= 4.2.4 -BuildRequires: yast2-libyui-devel >= 2.16.37 +BuildRequires: yast2-libyui-devel >= 2.16.47 Requires: libzypp >= 4.2.4 -Requires: yast2-libyui >= 2.16.37 +Requires: yast2-libyui >= 2.16.47 Requires: yast2_theme >= 2.16.1 Provides: yast2-qt:/usr/lib/YaST2/plugin/libpy2qt_pkg.so.2 Provides: yast2_ui_pkg -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r47241 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQRadioButton.cc src/YQRadioButtonGroup.cc src/YQRadioButtonGroup.h
by sh-sh-sh＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: sh-sh-sh Date: Wed Apr 30 17:43:52 2008 New Revision: 47241 URL: http://svn.opensuse.org/viewcvs/yast?rev=47241&view=rev Log: Fixed bnc #379904: More than one radio button checked Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQRadioButton.cc trunk/qt/src/YQRadioButtonGroup.cc trunk/qt/src/YQRadioButtonGroup.h Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=47241&r1=47… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Wed Apr 30 17:43:52 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "44") +SET(VERSION_PATCH "45") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Wed Apr 30 17:43:52 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 30 17:43:03 CEST 2008 - sh(a)suse.de + +- Fixed bnc #379904: More than one radio button checked +- V 2.16.45 + +------------------------------------------------------------------- Tue Apr 29 17:05:40 CEST 2008 - sh(a)suse.de - Fixed bnc #383672 - Busy cursor in file dialogs Modified: trunk/qt/src/YQRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQRadioButton.cc?rev=4724… ============================================================================== --- trunk/qt/src/YQRadioButton.cc (original) +++ trunk/qt/src/YQRadioButton.cc Wed Apr 30 17:43:52 2008 @@ -50,6 +50,12 @@ { setWidgetRep( this ); + // QRadioButton uses its own logic by default to make sure that only one + // button of a radio box is checked at any time, but this interferes with + // YRadioButtonGroup. Let YRadioButtonGroup and YQRadioButton::changed() + // handle this. + setAutoExclusive( false ); + setChecked( checked ); installEventFilter(this); @@ -98,6 +104,7 @@ { YQSignalBlocker sigBlocker( this ); + // yuiDebug() << "Setting " << this << (newValue ? " on" : " off") << endl; setChecked( newValue ); if ( newValue ) @@ -132,12 +139,19 @@ } -// slots - void YQRadioButton::changed( bool newState ) { - if ( notify() && newState ) - YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ValueChanged ) ); + if ( newState ) + { + yuiDebug() << "User set " << this << ( newState ? " on" : " off" ) << endl; + YRadioButtonGroup * group = buttonGroup(); + + if ( group ) + group->uncheckOtherButtons( this ); + + if ( notify() ) + YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ValueChanged ) ); + } } Modified: trunk/qt/src/YQRadioButtonGroup.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQRadioButtonGroup.cc?rev… ============================================================================== --- trunk/qt/src/YQRadioButtonGroup.cc (original) +++ trunk/qt/src/YQRadioButtonGroup.cc Wed Apr 30 17:43:52 2008 @@ -23,12 +23,12 @@ #include "YQRadioButtonGroup.h" #include "YQRadioButton.h" +#include "qstring.h" YQRadioButtonGroup::YQRadioButtonGroup( YWidget * parent ) : QWidget( (QWidget *) parent->widgetRep() ) , YRadioButtonGroup( parent ) - , _recursive( false ) { setWidgetRep( this ); } @@ -47,13 +47,8 @@ if ( button->value() ) // if this new button is active { - uncheckOtherButtons( button ); // make it the only active + uncheckOtherButtons( button ); // make it the only active one } - - QRadioButton * radio_button = dynamic_cast<YQRadioButton *>( button ); - - connect ( radio_button, SIGNAL ( toggled ( bool ) ), - this, SLOT ( radioButtonClicked( bool ) ) ); } @@ -73,47 +68,4 @@ } -void -YQRadioButtonGroup::radioButtonClicked( bool newState ) -{ - // Prevent infinite recursion: YQRadioButton::setValue() might cause Qt - // signals that would cause recursion to this place. - - if ( _recursive ) - return; - - _recursive = true; - - QRadioButton * senderButton = (QRadioButton *) sender(); - - // Implement radio box behaviour: Uncheck all other radio buttons - - for ( YRadioButtonListConstIterator it = radioButtonsBegin(); - it != radioButtonsEnd(); - ++it ) - { - YQRadioButton * radioButton = dynamic_cast<YQRadioButton *> (*it); - - if ( radioButton ) - { - if ( radioButton == senderButton ) - { - // If this button has been clicked, it is to be the RadioBox's - // active button - regardless of newState. This is to avoid - // RadioBoxes where no single button is active; otherwise the - // second click would deactivate the only active button. - - radioButton->setValue( true ); - } - else - { - radioButton->setValue( false ); - } - } - } - - _recursive = false; -} - - #include "YQRadioButtonGroup.moc" Modified: trunk/qt/src/YQRadioButtonGroup.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQRadioButtonGroup.h?rev=… ============================================================================== --- trunk/qt/src/YQRadioButtonGroup.h (original) +++ trunk/qt/src/YQRadioButtonGroup.h Wed Apr 30 17:43:52 2008 @@ -58,24 +58,6 @@ * Reimplemented from YWidget. **/ virtual void setSize( int newWidth, int newHeight ); - - -private slots: - - /** - * Triggered when one of the radio buttons changed state. - * This implements the radio box behaviour, i.e. unselects all but the last - * selected radio button. - **/ - void radioButtonClicked( bool newState ); - - -private: - - /** - * Used to prevent infinite recursion due to signal race conditions. - **/ - bool _recursive; }; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r47240 - /tags/branch-SLE-10-SP2-2_13_155/bootloader/
by juhliarik＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: juhliarik Date: Wed Apr 30 16:47:07 2008 New Revision: 47240 URL: http://svn.opensuse.org/viewcvs/yast?rev=47240&view=rev Log: Created tag branch-SLE-10-SP2-2_13_155 for bootloader Added: tags/branch-SLE-10-SP2-2_13_155/bootloader/ - copied from r47239, branches/SuSE-SLE-10-SP2-Branch/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r47239 - /tags/branch-SLE-10-SP2-2_13_155/
by juhliarik＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: juhliarik Date: Wed Apr 30 16:47:05 2008 New Revision: 47239 URL: http://svn.opensuse.org/viewcvs/yast?rev=47239&view=rev Log: Created tag branch-SLE-10-SP2-2_13_155 Added: tags/branch-SLE-10-SP2-2_13_155/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r47238 - in /branches/SuSE-SLE-10-SP2-Branch/bootloader: VERSION package/yast2-bootloader.changes src/routines/lilolike.ycp
by juhliarik＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: juhliarik Date: Wed Apr 30 16:36:21 2008 New Revision: 47238 URL: http://svn.opensuse.org/viewcvs/yast?rev=47238&view=rev Log: - added fix for deleting old boot sections (bnc# 367356) - new version 2.13.155 M bootloader/VERSION * new version 2.13.155 M bootloader/src/routines/lilolike.ycp * added fix in function RemoveUnexistentSections() M bootloader/package/yast2-bootloader.changes * description of changes Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/VERSION Wed Apr 30 16:36:21 2008 @@ -1 +1 @@ -2.13.154 +2.13.155 Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes Wed Apr 30 16:36:21 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 30 16:34:19 CEST 2008 - juhliarik(a)suse.cz + +- added fix for deleting old boot sections (bnc# 367356) +- 2.13.155 + +------------------------------------------------------------------- Tue Mar 18 17:40:42 CET 2008 - juhliarik(a)suse.cz - deleting ordering of disk if the first disk is USB Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/src/routines/lilolike.ycp Wed Apr 30 16:36:21 2008 @@ -823,6 +823,9 @@ { string defaultv = globals["default"]:""; string first = nil; + + y2milestone("Starting RemoveUnexistentSections() with sections: %1", BootCommon::sections); + BootCommon::sections = filter (map<string,any> s, BootCommon::sections, { string label = s["name"]:""; @@ -831,6 +834,7 @@ { if (first == nil) first = label; + y2milestone("Section is not deleted, section: %1", s); return true; } @@ -840,13 +844,27 @@ y2warning ("Removing section with empty title"); if (label == defaultv) defaultv = nil; + y2milestone("Deleted (empty label) section: %1", s); return false; } + // bug #367356 After an upgrade install grub default menu selection is still the SP1 kernel + // problem is that section map doesn't include "original_name" + + if ((type =="") && (s["type"]:"" == "image")) + { + y2milestone("Missing key \"original_name\" in section map for section: %1", s); + + // checking root value + if (s["root"]:"" == RootPartitionDevice) + type="linux"; + + } // FIXME the following check makes sense for all sections` if (! contains (["linux", "failsafe", "memtest86", "xen"], type)) { if (first == nil) first = label; + y2milestone("Section is not deleted (type of section), section: %1", s); return true; } string kernel =""; @@ -859,6 +877,7 @@ { if (first == nil) first = label; + y2milestone("Section is not deleted (empty kernel/image), section: %1", s); return true; } if (substring (kernel, 0, 1) == "/") @@ -868,7 +887,10 @@ else { if (relative_path_prefix == "") + { + y2milestone("Section is not deleted (relative_path_prefix == \"\"), section: %1", s); return true; + } kernel = relative_path_prefix + kernel; } if (SCR::Read (.target.size, kernel) == -1) @@ -877,10 +899,13 @@ label, kernel); if (label == defaultv) defaultv = nil; + + y2milestone("Deleted (kernel does't exist) section: %1", s); return false; } if (first == nil) first = label; + y2milestone("Section is not deleted (it seems be OK), section: %1", s); return true; }); if (defaultv == nil) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r47237 - /branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp
by aschnell＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: aschnell Date: Wed Apr 30 16:12:20 2008 New Revision: 47237 URL: http://svn.opensuse.org/viewcvs/yast?rev=47237&view=rev Log: - show for data Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dm.ycp Wed Apr 30 16:12:20 2008 @@ -15,7 +15,7 @@ return StorageFields::PredicateType(disk, partition, [`CT_DM]); } - list<symbol> fields = StorageFields::Filter([ `device, `size, `mount_point ]); + list<symbol> fields = StorageFields::Filter([ `device, `size, `fs_type, `mount_point ]); map<string, map> target_map = Storage::GetTargetMap(); @@ -48,7 +48,8 @@ map<string, map> target_map = Storage::GetTargetMap(); - list<symbol> fields = StorageFields::Filter([ `mount_point, `size, `fs_type ]); + list<symbol> fields = StorageFields::Filter([ `device, `mount_point, `mount_by, + `size, `fs_type, `uuid, `label, `newline, `used_by ]); UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r47236 - in /branches/tmp/aschnell/part-redesign/storage/src/include: ep-log.ycp ep-main.ycp ep-settings.ycp icons.ycp
by aschnell＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: aschnell Date: Wed Apr 30 16:03:36 2008 New Revision: 47236 URL: http://svn.opensuse.org/viewcvs/yast?rev=47236&view=rev Log: - start moving icon names to a central place Added: branches/tmp/aschnell/part-redesign/storage/src/include/icons.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-log.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-log.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-log.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-log.ycp Wed Apr 30 16:03:36 2008 @@ -16,10 +16,12 @@ string file = "/var/log/messages"; UI::ReplaceWidget(`tree_panel, - `VBox( - `Left(`Heading(_("Log"))), - `LogView(`id(`log), sformat(_("Contents of %1:"), file), 10, 0), - `PushButton(`id(`update), _("Update")) + Greasemonkey::Transform( + `VBox( + `IconAndHeading(_("Log"), log_icon), + `LogView(`id(`log), sformat(_("Contents of %1:"), file), 10, 0), + `PushButton(`id(`update), _("Update")) + ) )); Wizard::RestoreHelp("Log help TODO"); Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Wed Apr 30 16:03:36 2008 @@ -22,6 +22,8 @@ void UpdateNavigationTree(any new_focus); + include "partitioning/icons.ycp"; + include "partitioning/ep-lib.ycp"; include "partitioning/ep-dialogs.ycp"; @@ -135,8 +137,8 @@ `item(`id(`nfs), `icon("yast-nfs.png"), _("NFS"), open(`nfs), subtree[`nfs]:[]), `item(`id(`unused), `icon("yast-general.png"), _("Unused Devices"), open(`unused)) ]), - `item(`id(`settings), `icon("yast.png"), _("Settings"), open(`settings)), - `item(`id(`log), `icon("yast-messages.png"), _("Log"), open(`log)) ]; + `item(`id(`settings), `icon(settings_icon), _("Settings"), open(`settings)), + `item(`id(`log), `icon(log_icon), _("Log"), open(`log)) ]; } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-settings.ycp Wed Apr 30 16:03:36 2008 @@ -36,7 +36,7 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( - `Left(`Heading("Settings")), + `IconAndHeading(_("Settings"), settings_icon), `VBox( `Left(`ComboBoxSelected(`id(`preferred_displayname), `opt(`notify), //FIXME: find some better wording Added: branches/tmp/aschnell/part-redesign/storage/src/include/icons.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/icons.ycp (added) +++ branches/tmp/aschnell/part-redesign/storage/src/include/icons.ycp Wed Apr 30 16:03:36 2008 @@ -0,0 +1,10 @@ +/** + * File: icons.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Arvin Schnell <aschnell(a)suse.de> + */ +{ + const string settings_icon = "yast.png"; + const string log_icon = "yast-messages.png"; +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r47235 - /tags/stable-2_16_9/repair/
by jsuchome＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: jsuchome Date: Wed Apr 30 15:58:27 2008 New Revision: 47235 URL: http://svn.opensuse.org/viewcvs/yast?rev=47235&view=rev Log: Created tag stable-2_16_9 for repair Added: tags/stable-2_16_9/repair/ - copied from r47234, trunk/repair/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r47234 - in /trunk/repair: VERSION package/yast2-repair.changes src/OSRFstab.ycp src/OSRPkg.ycp src/OSRPkgVerify.ycp src/OSRPtbl.ycp src/osr_module_partition.ycp
by jsuchome＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: jsuchome Date: Wed Apr 30 15:57:48 2008 New Revision: 47234 URL: http://svn.opensuse.org/viewcvs/yast?rev=47234&view=rev Log: - extended help text if no partition was found (bnc#366856) - initialize target before source to get correct name of kernel - patterns now only recommend packages - handle encrypted partitions separately during fstab check - 2.16.9 (+ added some more debug messages for beta developement) Modified: trunk/repair/VERSION trunk/repair/package/yast2-repair.changes trunk/repair/src/OSRFstab.ycp trunk/repair/src/OSRPkg.ycp trunk/repair/src/OSRPkgVerify.ycp trunk/repair/src/OSRPtbl.ycp trunk/repair/src/osr_module_partition.ycp Modified: trunk/repair/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/VERSION?rev=47234&r1=4723… ============================================================================== --- trunk/repair/VERSION (original) +++ trunk/repair/VERSION Wed Apr 30 15:57:48 2008 @@ -1 +1 @@ -2.16.8 +2.16.9 Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.chan… ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Wed Apr 30 15:57:48 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Apr 22 11:58:58 CEST 2008 - jsuchome(a)suse.cz + +- extended help text if no partition was found (bnc#366856) +- initialize target before source to get correct name of kernel +- patterns now only recommend packages +- handle encrypted partitions separately during fstab check +- 2.16.9 + +------------------------------------------------------------------- Mon Apr 14 13:43:27 CEST 2008 - jsuchome(a)suse.cz - solver needs to be run before reading product info (bnc#368104) Modified: trunk/repair/src/OSRFstab.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRFstab.ycp?rev=4723… ============================================================================== --- trunk/repair/src/OSRFstab.ycp (original) +++ trunk/repair/src/OSRFstab.ycp Wed Apr 30 15:57:48 2008 @@ -117,6 +117,11 @@ list<string> checked_partitions = []; /** + * Encrypted partitions (actually not checked) + */ + list<string> encrypted_partitions = []; + + /** @example of map describing /etc/fstab: $[ @@ -302,6 +307,7 @@ integer i = 0; foreach (string partition_item, linux_partition_list, ``{ +y2internal ("partition to check: %1", partition_item); if ((boolean) WFM::Execute (.local.mount, [ partition_item, m_point, OSRExecute::OutputFile() ])) { @@ -573,6 +579,8 @@ */ define map devname2part(string dev_name)``{ + y2milestone ("device name %1", dev_name); + if (substring (dev_name, 0,1) != "/") return $[]; map ret = StorageDevices::GetCdromEntry( dev_name); @@ -622,6 +630,13 @@ if (ret == $[] || ret == nil) { ret = Storage::GetPartition( Storage::GetTargetMap(), dev_name ); + if (ret == $[] && substring (dev_name, 0, 15) == "/dev/mapper/cr_") + { + // encrypted partition does not show the real device name + dev_name = "/dev/" + substring (dev_name, 15); + y2milestone ("transforming device name to %1", dev_name); + ret = Storage::GetPartition (Storage::GetTargetMap(), dev_name); + } if (ret != $[] && ret != nil) { /* dev name might be: /dev/disk/by-id/scsi-SATA_ST340016A_3HS8YAL0-part6 @@ -661,6 +676,7 @@ define boolean check_dev_entry(string p)``{ map part = devname2part(p); +y2internal ("part map for device %1: %2", p, part); map lines = filter (integer lnr, map line, fstab["l"]:$[], ``( (line["fields",0]:"!" == p) || @@ -867,6 +883,8 @@ { list<string> special_freq = []; list<string> special_passno = []; + string dev_name = part["dev_name"]:""; + string device = part["device"]:""; // cdrom floppy zip if (part["found"]:"" == "floppy" || @@ -880,8 +898,10 @@ fs_mntops = check_fs_mntops( line); } else if ((part["found"]:"" == "dev") && - (contains (checked_partitions, part["dev_name"]:"") || - contains (checked_partitions, part["device"]:"")) + (contains (checked_partitions, dev_name) || + contains (checked_partitions, device) || + contains (encrypted_partitions, dev_name) || + contains (encrypted_partitions, device)) ) { // check root first with CheckRootEntry!! @@ -899,8 +919,8 @@ part["mount"] = line[1]:""; Storage::ChangeVolumeProperties(part); } - else if ((contains (swapable_partition_list, part["dev_name"]:"") || - contains (swapable_partition_list, part["device"]:"")) && + else if ((contains (swapable_partition_list, dev_name) || + contains (swapable_partition_list, device)) && part["found"]:"" == "swap") { type = "swap"; @@ -1007,16 +1027,18 @@ * Check if all entries in the fstab are valid and * if all found devices have an entry in the fstab. */ - global define boolean Check(list<string> tswapable_partition_list, - list<string> tchecked_partitions) ``{ - - ResetSettings(); - swapable_partition_list = tswapable_partition_list; - checked_partitions = tchecked_partitions; + global define boolean Check (list<string> tswapable_partition_list, + list<string> tchecked_partitions, + list<string> tencrypted_partitions) + { + ResetSettings(); + swapable_partition_list = tswapable_partition_list; + checked_partitions = tchecked_partitions; + encrypted_partitions = tencrypted_partitions; map fstab2part = $[]; - // check all lines in existing fstab file + // check all lines in existing fstab file foreach (integer lnr, map line, fstab["l"]:$[], ``{ y2milestone("----check fstab line %1 ", lnr); if (! contains (valid_lines, lnr)) Modified: trunk/repair/src/OSRPkg.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPkg.ycp?rev=47234&… ============================================================================== --- trunk/repair/src/OSRPkg.ycp (original) +++ trunk/repair/src/OSRPkg.ycp Wed Apr 30 15:57:48 2008 @@ -15,7 +15,6 @@ textdomain "repair"; import "DefaultDesktop"; - import "Kernel"; import "Mode"; import "Report"; import "Wizard"; @@ -207,8 +206,8 @@ list<map> descrs = Pkg::ResolvableDependencies (p,`pattern, ""); foreach (map descr, descrs, { foreach (map dep, (list<map>)descr["dependencies"]:[], { - if (dep["res_kind"]:"" == "package" && - dep["dep_kind"]:"" == "requires") + if (dep["res_kind"]:"" == "package" && contains ( + ["requires", "recommends"], dep["dep_kind"]:"")) { minimal_selection = add (minimal_selection, dep["name"]:""); @@ -232,6 +231,18 @@ y2milestone("Open pkg database with target system -%1-", root ); if (root != "" && root != nil ) root_mountpoint = root; + // open target system for Pkg access + if (!target_initialized) + { + if (first_time_openpkg) + { + y2milestone ("first time initializig -> finish target before"); + Pkg::TargetFinish (); + first_time_openpkg = false; + } + target_initialized = Pkg::TargetInit ( root, false); + } + // open the package source if (! Stage::initial () ) { @@ -260,19 +271,6 @@ } } - // open target system for Pkg access - if (!target_initialized) - { - if (first_time_openpkg) - { - y2milestone ("first time initializig -> finish target before"); - Pkg::TargetFinish (); - first_time_openpkg = false; - } - target_initialized = Pkg::TargetInit ( root, false); - get_minimal_selection (); - } - // something failed if (! target_initialized || ! source_initialized ) { @@ -706,10 +704,7 @@ else if (what == "base") { list<string> minimal = get_minimal_selection (); - list<string> special = []; - - minimal = filter (string p, minimal, ``( Pkg::IsAvailable(p))); - ret = (list<string>) union (minimal, special) ; + ret = filter (string p, minimal, ``( Pkg::IsAvailable(p))); } else { Modified: trunk/repair/src/OSRPkgVerify.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPkgVerify.ycp?rev=… ============================================================================== --- trunk/repair/src/OSRPkgVerify.ycp (original) +++ trunk/repair/src/OSRPkgVerify.ycp Wed Apr 30 15:57:48 2008 @@ -14,7 +14,6 @@ textdomain "repair"; - import "Kernel"; import "OSRExecute"; import "OSRLogFile"; import "OSRMode"; Modified: trunk/repair/src/OSRPtbl.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPtbl.ycp?rev=47234… ============================================================================== --- trunk/repair/src/OSRPtbl.ycp (original) +++ trunk/repair/src/OSRPtbl.ycp Wed Apr 30 15:57:48 2008 @@ -1336,13 +1336,16 @@ r_button = add( r_button, rd["default"]:false ); r_options = add( r_options , `Left( r_button )); }); - //%1 is device label, such as /dev/hda + // %1 is device label, such as /dev/hda + // sometimes it is not a problem (see bug 366856) => calm user with the + // last sentence string error_text = sformat(_(" No partition table was found for hard disk %1. If at least one partition should exist for %1, select one of the following repair methods. If no partition ever existed on this hard disk, skip the repair. +If in doubt, skip the repair. "), target); Modified: trunk/repair/src/osr_module_partition.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/osr_module_partition.… ============================================================================== --- trunk/repair/src/osr_module_partition.ycp (original) +++ trunk/repair/src/osr_module_partition.ycp Wed Apr 30 15:57:48 2008 @@ -393,10 +393,11 @@ OSRCommon::RequireList("fsck_partitions"); list<map> mounted_partitions = (list<map>) OSRCommon::RequireList("mounted_partitions"); - list<string> checked_partitions = []; + list<string> checked_partitions = []; + list<string> encrypted_partitions = []; foreach(map p, fsck_partitions, { - +y2internal ("partition to check %1", p); string dev_name = p["device"]:""; // summary header string summary_header = sformat(_("Executing file system check for partition %1..."), dev_name ); @@ -412,6 +413,7 @@ OSRSummary::DetectOmit (summary_header, // summary text _("Partition is encrypted: check not supported")); + encrypted_partitions = add (encrypted_partitions, dev_name); } else { @@ -458,6 +460,7 @@ } }); OSRCommon::ProvideList( "checked_partitions", checked_partitions ); + OSRCommon::ProvideList( "encrypted_partitions", encrypted_partitions ); return true; } @@ -849,9 +852,11 @@ string root_partition = OSRCommon::RequireString("root_partition"); - if ( OSRFstab::Check ( + if (OSRFstab::Check ( (list<string>)OSRCommon::RequireList("swapable_partitions"), - (list<string>)OSRCommon::RequireList("checked_partitions"))) + (list<string>)OSRCommon::RequireList("checked_partitions"), + (list<string>)OSRCommon::RequireList("encrypted_partitions")) + ) { // summary text OSRSummary::DetectOK("", _("fstab entries valid")); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0