October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52715 - in /trunk/storage/storage/src: include/lvm_lib.ycp include/lvm_lv_lib.ycp include/lvm_pv_lib.ycp include/lvm_ui_dialogs.ycp include/partition_defines.ycp inst_custom_part.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 23:54:56 2008 New Revision: 52715 URL: http://svn.opensuse.org/viewcvs/yast?rev=52715&view=rev Log: - disabled many unused functions Modified: trunk/storage/storage/src/include/lvm_lib.ycp trunk/storage/storage/src/include/lvm_lv_lib.ycp trunk/storage/storage/src/include/lvm_pv_lib.ycp trunk/storage/storage/src/include/lvm_ui_dialogs.ycp trunk/storage/storage/src/include/partition_defines.ycp trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/include/lvm_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lib.ycp Wed Oct 29 23:54:56 2008 @@ -61,6 +61,7 @@ // return "0" if input is invalid // // pesize is valid 8kB to 512MB in power of 2 +// used by autoyast define integer pesize_str_to_byte(string input) { integer ret = kmgt_str_to_byte(input); @@ -76,7 +77,7 @@ ////////////////////////////////////////////////////////////////////// // Let the User create a new Volume group: open dialog ... // return: the changed targetMap and lvm_vgs and cancelled - +// used by autoyast define map addVolumeGroup( map vg, map<string,map> targetMap, list lvm_vgs ) ``{ boolean cancelled = true; @@ -117,4 +118,5 @@ ``{ return( Storage::DeleteLvmVg( current_vg )); }; + } Modified: trunk/storage/storage/src/include/lvm_lv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lv_lib.ycp Wed Oct 29 23:54:56 2008 @@ -64,6 +64,7 @@ return( ret ); }; +/* define boolean editLogicalVolume( map Lv, string current_vg) ``{ y2milestone( "editLogicalVolume Lv:%1", Lv ); @@ -84,6 +85,8 @@ } return( ret ); }; +*/ + define boolean removeLogicalVolume( string disk, string device ) ``{ @@ -107,7 +110,8 @@ // ... // // out: [ 10344343, 2223333 ] [ used, avail ] - + +/* define list get_lv_size_info( map<string,map> targetMap, string current_vg ) ``{ list ret = []; @@ -119,7 +123,7 @@ y2milestone( "get_lv_size_info vg=%1 ret=%2", current_vg, ret ); return( ret ); }; - +*/ //////////////////////////////////////////////////////////////////////////////// // Get all existing lv names of a volume group @@ -151,6 +155,7 @@ // `item(`id(2//dev/hda), "/dev/hda2 ", " /usr ", "system", " 2G ", " Linux ") // ]; +/* define list get_lv_widget_table( list<map> possPvList ) ``{ list ret = []; @@ -181,7 +186,7 @@ } )); }; - +*/ } Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_pv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_pv_lib.ycp Wed Oct 29 23:54:56 2008 @@ -37,6 +37,7 @@ // ////////////////////////////////////////////////////////////////////// +// used by autoyast define boolean addPhysicalVolume( map<string,map> targetMap, string id, string current_vg ) ``{ @@ -53,8 +54,9 @@ boolean ret = Storage::ExtendLvmVg( current_vg, id ); return( ret ); }; - + +/* define boolean removePhysicalVolume( map<string,map> targetMap, string id, string current_vg ) ``{ @@ -77,12 +79,13 @@ } return( ret ); }; - +*/ ////////////////////////////////////////////////////////////////////// // belongs the the partition "id" already to a volume group ////////////////////////////////////////////////////////////////////// +/* define boolean isItemPv( map<string,map> tg, string id ) ``{ map part = $[]; @@ -93,13 +96,13 @@ return( part["used_by_type"]:`UB_NONE == `UB_LVM || part["used_by_type"]:`UB_NONE == `UB_EVMS ); }; - +*/ ////////////////////////////////////////////////////////////////////// // belongs the the partition "id" already to a volume group // if YES: popup a proper Message and return(false) ////////////////////////////////////////////////////////////////////// - +/* define boolean CheckItemIsNotPv( map<string,map> tg, string id ) ``{ if( !isItemPv(tg,id) ) @@ -156,7 +159,7 @@ } return( false ); }; - +*/ ///////////////////////////////////////////////////////////////// // Get all partitions, we can probably use as physical volumes @@ -239,6 +242,7 @@ * -> Existing LVM partition with volume group * -> size of volume group to small for all logical partition */ +/* define boolean check_pv_delete( map<string,map> targetMap, string id, string current_vg ) ``{ @@ -260,7 +264,7 @@ y2milestone( "check_pv_delete ret:%1", ret ); return( ret ); } - +*/ boolean check_vgname_dev( string vgname ) { @@ -282,4 +286,3 @@ return( ret ); } } - Modified: trunk/storage/storage/src/include/lvm_ui_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_ui_dialogs.ycp (original) +++ trunk/storage/storage/src/include/lvm_ui_dialogs.ycp Wed Oct 29 23:54:56 2008 @@ -32,15 +32,17 @@ include "partitioning/custom_part_dialogs.ycp"; include "partitioning/custom_part_lib.ycp"; include "partitioning/lvm_lv_lib.ycp"; -include "partitioning/lvm_ui_lib.ycp"; +/* define void handle_max( integer stripe, string max_text ) ``{ y2milestone( "stripe %1", stripe ); UI::ChangeWidget(`id("max_size"), `Enabled, stripe==1 ); UI::ChangeWidget(`id("max_text"), `Value, stripe==1?max_text:"" ); } - +*/ + +/* define map DlgCreateEditLogicaVolume( symbol create_or_edit, map<string,any> Lv, integer max_size, string vgname, list lvs, map<symbol,map> file_systems, @@ -381,13 +383,13 @@ return( nil ); } }; - +*/ ////////////////////////////////////////////////////////////////////////////// // Dialog "Create a Volume Group ////////////////////////////////////////////////////////////////////////////// - +/* define boolean HandleEditLv( map<string,map> targetMap, string device ) ``{ boolean ret = false; @@ -420,6 +422,7 @@ y2milestone( "ret %1", ret ); return( ret ); } +*/ define boolean HandleRemoveLv( map<string,map> targetMap, string id ) ``{ @@ -470,6 +473,7 @@ return( ret ); } +/* define map DlgCreateVolumeGroup( list vgm_list ) ``{ string vgname = ""; @@ -574,5 +578,6 @@ return( $[] ); } }; +*/ } Modified: trunk/storage/storage/src/include/partition_defines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/part… ============================================================================== --- trunk/storage/storage/src/include/partition_defines.ycp (original) +++ trunk/storage/storage/src/include/partition_defines.ycp Wed Oct 29 23:54:56 2008 @@ -177,6 +177,7 @@ *---------------------------------------------------------------------- * TODO: remove */ +/* string ByteToHumanStringWithZero(integer number) { if (number == 0) @@ -189,7 +190,7 @@ return ByteToHumanString(number); } }; - +*/ //////////////////////////////////////////////////////////////////////// // input: Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Wed Oct 29 23:54:56 2008 @@ -1862,7 +1862,7 @@ } else if( part["type"]:`unknown == `lvm ) { - HandleEditLv( tg, id ); + // HandleEditLv( tg, id ); } else { -- 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] r52714 - /trunk/storage/storage/src/include/ep-main.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 23:39:47 2008 New Revision: 52714 URL: http://svn.opensuse.org/viewcvs/yast?rev=52714&view=rev Log: - stricter type Modified: trunk/storage/storage/src/include/ep-main.ycp Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Wed Oct 29 23:39:47 2008 @@ -241,7 +241,7 @@ } - any ExpertPartitioner() + symbol ExpertPartitioner() { SCR::Write(.target.ycp, Storage::SaveDumpPath("targetmap-ep-start"), Storage::GetTargetMap()); -- 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] r52713 - /trunk/storage/storage/src/include/custom_part_lib.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 23:16:26 2008 New Revision: 52713 URL: http://svn.opensuse.org/viewcvs/yast?rev=52713&view=rev Log: - use Storage::ByteToHumanString Modified: trunk/storage/storage/src/include/custom_part_lib.ycp Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Wed Oct 29 23:16:26 2008 @@ -502,7 +502,7 @@ // %2 is prelaced by a size (e.g. 10 MB) Popup::Warning(sformat(_("Your partition is too small to use %1. The minimum size for this file system is %2. -"), FileSystems::GetName(fs,""), ByteToHumanStringWithZero(min_size) )); +"), FileSystems::GetName(fs,""), Storage::ByteToHumanString(min_size) )); ret = false; } } @@ -1171,7 +1171,7 @@ // error popup text Popup::Error(sformat(_("The size entered is invalid. Enter a size from 1M to %1. For example, 40M or 1G."), - ByteToHumanStringWithZero(max_size)) ); + Storage::ByteToHumanString(max_size)) ); else // error popup text Popup::Error(_("The size entered is invalid. @@ -1185,7 +1185,7 @@ // error popup text Popup::Error(sformat(_("The size entered is too large. Enter a size from 1M to %1."), - ByteToHumanStringWithZero(max_size)) ); + Storage::ByteToHumanString(max_size)) ); return( false ); } -- 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] r52712 - in /trunk/storage/storage/src: inst_custom_part.ycp modules/Storage.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 20:37:49 2008 New Revision: 52712 URL: http://svn.opensuse.org/viewcvs/yast?rev=52712&view=rev Log: - removed two obsolete functions Modified: trunk/storage/storage/src/inst_custom_part.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Wed Oct 29 20:37:49 2008 @@ -35,7 +35,6 @@ include "partitioning/partition_defines.ycp"; - include "partitioning/nfs.ycp"; include "partitioning/lvm_ui_dialogs.ycp"; include "partitioning/lvm_pv_lib.ycp"; include "partitioning/raid_lib.ycp"; Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Oct 29 20:37:49 2008 @@ -4156,23 +4156,6 @@ } -// TODO: remove -/* Contain the current key ( subdevkey ) for all wizards */ -string WizardKey = ""; - -global define string GetWizardKey() - ``{ - y2debug( " Return wizard key %1", WizardKey); - return WizardKey; - }; - -global define void SetWizardKey( string key ) - ``{ - y2debug(" Set WizardKey %1", WizardKey); - WizardKey = key; - }; - - /** * Check if a disk is a real disk and not RAID or LVM * -- 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] r52711 - /trunk/storage/storage/src/inst_custom_part.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 20:31:16 2008 New Revision: 52711 URL: http://svn.opensuse.org/viewcvs/yast?rev=52711&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Wed Oct 29 20:31:16 2008 @@ -45,14 +45,9 @@ - boolean edit_cylinder = true; boolean bsd_label = false; - string focusline = ""; - - - /*--------------------------------------------------------------------- * Check if the numer is in the format <number> * @@ -1817,44 +1812,7 @@ symbol ret = nil; - y2milestone( "Custom partitioner started" ); - Storage::SetWizardKey(""); - - SCR::Write(.target.ycp, Storage::SaveDumpPath("targetMap_s"), - Storage::GetTargetMap() ); - - map<string,map> tg = Storage::GetTargetMap(); - - if( !Storage::CheckBackupState("custom_part") ) - { - Storage::CreateTargetBackup("custom_part"); - } - - - - // Main dialog: Header - - string back_label = ""; - string next_label = ""; - if( Stage::initial () ) - { - back_label = Label::BackButton(); - next_label = Label::NextButton(); - } - else - { - back_label = Label::CancelButton(); - next_label = Label::OKButton(); - Wizard::HideAbortButton(); - } - - ////////////////////////////////////////////////////////////////// - //// Loop for User Input .... - ////////////////////////////////////////////////////////////////// - - repeat - { map<string,map> tg = Storage::GetTargetMap(); ret = (symbol)Wizard::UserInput(); @@ -1866,7 +1824,6 @@ if (ret == `resize) { string id = (string)UI::QueryWidget(`id(`table), `CurrentItem); - focusline = id; map part = $[]; map disk = Storage::GetDisk( tg, id ); if( !haskey( tg, id ) ) @@ -1876,7 +1833,6 @@ { Popup::Error( Partitions::RdonlyText( disk["device"]:"", true )); ret = `again; - continue; } y2milestone( "disk=%1", disk ); @@ -1964,108 +1920,4 @@ } } - ///////////////////////////////////////////////////////////// - // End of Actions, Now check the returncode - ///////////////////////////////////////////////////////////// - - if (ret == `next || ret == `back || ret == `raid || ret == `lvm || - ret == `raid_settings || ret == `raid_wizard || ret == `evms ) - { - symbol doagain = `next; - - if( ret == `raid_wizard || ret == `raid_settings ) - { - if( Storage::CheckBackupState("raid")) - Storage::DisposeTargetBackup("raid"); - } - - if( ret == `back && - !Storage::EqualBackupStates( "custom_part", "", true )) - { - // popup text %1 will be replaces with button text - string txt = sformat( _("You have changed the partitioning. -These changes are lost if you exit the main dialog with %1. -Really quit the main dialog? -"), - deletechars(back_label,"&") ); - if( !Popup::YesNo( txt )) - { - doagain = `again; - } - } - if( ret == `next ) - { - boolean changed = - !Storage::EqualBackupStates( "custom_part", "", true ); - y2milestone( "CheckNext ret=%1 changed=%2", ret, changed ); - if( changed ) - { - Storage::SetPartMode( "CUSTOM" ); - Storage::UpdateChangeTime(); - } - } - if ( ret == `next ) - { - list retval = check_created_partition_table( Storage::GetTargetMap(), true, - Stage::initial()&&!Mode::repair() ); - Storage::SetTargetMap( retval[0]:$[] ); - doagain = retval[1]:`next; - } - - if( (ret==`abort || ret==`back || ret==`next) && doagain!=`again ) - { - Storage::DisposeTargetBackup("custom_part"); - } - - if( doagain == `again ) ret = `again; - - if( ret != `back ) - { - if (ret == `apply) return `again; - } - if( (ret == `back||ret==`abort) && Storage::GetPartMode()=="NORMAL" ) - { - Storage::SetPartMode( "CUSTOM" ); - } - } - - y2milestone( "end main loop ret %1 focusline %2", ret, focusline ); - } until (ret == `next || ret == `back || ret == `cancel || - ret == `raid_wizard || ret == `raid_settings || - ret == `evms || - ret == `lvm || ret == `lvmlv || ret == `abort ); - - Wizard::RestoreNextButton(); - if( (ret == `lvm || ret == `raid_wizard || ret == `raid_settings || - ret == `evms) && - !Stage::initial () ) - { - Wizard::RestoreBackButton(); - } - - - - SCR::Write(.target.ycp, Storage::SaveDumpPath("targetMap_e"), - Storage::GetTargetMap() ); - - //next by installation - if( Stage::initial () && ret == `next ) - ret = `instnext; - - //next in existing system - if( !Stage::initial () && ret == `next ) - ret = `sysnext; - - if( ret == `back ) - ret = `backtoi; - - /* - if( ret == `raid_settings || ret == `raid_wizard ) - Storage::Record(); - */ - - y2milestone( "ChangeTime %1", Storage::GetTargetChangeTime() ); - - return ret; - } -- 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] r52710 - /tags/stable-2_17_10/registration/
by jdsn＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jdsn Date: Wed Oct 29 19:43:15 2008 New Revision: 52710 URL: http://svn.opensuse.org/viewcvs/yast?rev=52710&view=rev Log: Created tag stable-2_17_10 for registration Added: tags/stable-2_17_10/registration/ - copied from r52709, trunk/registration/ -- 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] r52709 - in /trunk/registration: VERSION package/yast2-registration.changes src/clients/inst_suse_register.ycp src/config/Makefile.am yast2-registration.spec.in
by jdsn＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jdsn Date: Wed Oct 29 19:43:03 2008 New Revision: 52709 URL: http://svn.opensuse.org/viewcvs/yast?rev=52709&view=rev Log: remove requires to sles-release fix makefile 2.17.10 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/inst_suse_register.ycp trunk/registration/src/config/Makefile.am trunk/registration/yast2-registration.spec.in Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=52709&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Wed Oct 29 19:43:03 2008 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Wed Oct 29 19:43:03 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 29 16:32:31 CET 2008 - jdsn(a)suse.de + +- remove requires to sles-release +- 2.17.10 + +------------------------------------------------------------------- Wed Oct 29 15:31:04 CET 2008 - jdsn(a)suse.de - consistent naming in autoYaST profile Modified: trunk/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_su… ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Wed Oct 29 19:43:03 2008 @@ -577,6 +577,7 @@ boolean launchBrowser(string url) { + boolean retval=false; y2milestone("Just about to start a browser for manual interaction in registration."); // check for valid url map parsed = URL::Parse(url); @@ -600,16 +601,18 @@ if (textmode) { y2milestone("Launching textmode browser with: %1", command); - UI::RunInTerminal(command); + retval = ( (integer)UI::RunInTerminal(command) == 0 ) ? true:false; } else { y2milestone("Launching graphical borwser with: %1", command); - SCR::Execute(.target.bash, command ); + retval = ( (integer)SCR::Execute(.target.bash, command ) == 0 ) ? true:false; } + y2milestone("The registration browser returned with error code: %1", retval); + UI::RedrawScreen(); - return true; + return retval; } @@ -897,7 +900,7 @@ else if ( SRstatus == 1 ) { // still needinfo, change displayed information and stay in manual interaction - manual_interaction_overview = Register::suseRegisterListParams(); + manual_interaction_overview = YSR::get_registerReadableText(); // (bnc#435869) UI::ChangeWidget( `id(`needinfo), `Value, manual_interaction_overview ); } else Modified: trunk/registration/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/config/Makefile… ============================================================================== --- trunk/registration/src/config/Makefile.am (original) +++ trunk/registration/src/config/Makefile.am Wed Oct 29 19:43:03 2008 @@ -3,7 +3,7 @@ desktop_DATA = suse_register.desktop customer_center.desktop online_update_configuration.desktop rncdir = $(schemadir)/autoyast/rnc -rnc_DATA = registration.rnc automatic_online_update.rnc +rnc_DATA = registration.rnc online_update_configuration.rnc fillup_DATA = sysconfig.suse_register-yast2-registration sysconfig.automatic_online_update-yast2-registration Modified: trunk/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/yast2-registration.… ============================================================================== --- trunk/registration/yast2-registration.spec.in (original) +++ trunk/registration/yast2-registration.spec.in Wed Oct 29 19:43:03 2008 @@ -14,7 +14,7 @@ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-packager BuildRequires: perl-TimeDate limal limal-perl limal-ca-mgm-perl BuildRequires: yast2-pkg-bindings >= 2.17.20 -BuildRequires: suseRegister sles-release +BuildRequires: suseRegister BuildArchitectures: noarch @@ -57,8 +57,7 @@ %dir @yncludedir@/registration @yncludedir@/registration/*.ycp @desktopdir@/*.desktop -@schemadir@/autoyast/rnc/registration.rnc -@schemadir@/autoyast/rnc/automatic_online_update.rnc +@schemadir@/autoyast/rnc/*.rnc /usr/lib/YaST2/bin/online_update /usr/share/YaST2/yastbrowser -- 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] r52708 - /trunk/storage/storage/src/include/raid_lib.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 18:46:55 2008 New Revision: 52708 URL: http://svn.opensuse.org/viewcvs/yast?rev=52708&view=rev Log: - removed obsolete functions Modified: trunk/storage/storage/src/include/raid_lib.ycp Modified: trunk/storage/storage/src/include/raid_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/raid… ============================================================================== --- trunk/storage/storage/src/include/raid_lib.ycp (original) +++ trunk/storage/storage/src/include/raid_lib.ycp Wed Oct 29 18:46:55 2008 @@ -11,71 +11,12 @@ * mike <mike(a)suse.de> * * $Id$ - * - * - *---------------------- - * rd or Rd == raid device, a device like hda1 or /dev/system/usr - * that belongs to a raid */ - - { import "Storage"; - import "Mode"; import "Partitions"; - import "Wizard"; - textdomain "storage"; - - -/** - * Build raid dev item list e.g.: [`item (`id ("/dev/md2"), "/dev/md2", false)] - * - **/ -define list<term> get_raid_devices( map tg, integer raid_nr ) - ``{ - list<term> all_raid_devices = []; - list<map> partitions = tg["/dev/md","partitions"]:[]; - - foreach( map part, partitions, - ``{ - integer num = part["nr"]:255; - all_raid_devices = - add( all_raid_devices, - `item( `id(sformat("/dev/md%1", num )), - Storage::GetDeviceName( "/dev/md", num ), - num == raid_nr )); - }); - return all_raid_devices; - }; - - /** - * Checks if a RAID is currently created or if it was already - * - **/ -define boolean IsRaidCreated( map tg, string device, symbol what ) - ``{ - boolean created = false; - if( what != `wizard ) - { - list<map> partitions = (list<map>)tg["/dev/md", "partitions"]:[]; - y2milestone( "parts %1", partitions ); - - foreach( map part, partitions, - ``{ - if( part["device"]:""==device && part["create"]:false ) - { - created = true; - } - }); - } - else - { - created = true; - } - y2milestone( "device %1 what %2 created %3", device, what, created ); - return( created ); - }; + textdomain "storage"; /* @@ -127,106 +68,4 @@ }); return( allret ); }; - - -/* - * get the number of devices which belong to the raid - */ -define integer getNrOfParts( map<string,map> targetMap, string current_raid ) - ``{ - list<map> partition_list = get_possible_rds( targetMap ); - string dev = "md" + current_raid; - - partition_list = filter( map part, partition_list, - ``( part["used_by"]:""==dev ) ); - return( size( partition_list ) ); - }; - - -/** - * belongs the the partition "id" already to a raid - **/ -define boolean isItemRd( map<string,map> tg, string id ) - ``{ - map partition = Storage::GetPartition( tg, id ); - return( partition["used_by_type"]:`UB_NONE == `UB_MD ); - }; - - -/** - * number for /dev/mdX, 0 for /dev/md0, 1 for /dev/md1 - */ -define integer get_free_raid_nr( map<string,map> targetMap, integer min ) - ``{ - integer i = min; - list raid_nrs = maplist( map mdX, targetMap["/dev/md","partitions"]:[], - ``(mdX["nr"]:256)) ; - while( contains(raid_nrs, i) && i < 255) - { - i = i+1; - } - y2milestone( "get_free_raid_nr ret:%1", i ); - return( i ); - }; - -/** - * Add the main device ( "/dev/hda") to the partition map. - * partition = $[ - * "nr" : 1, - * "main_dev": "/dev/hda", - * ...... - * ]; - * Use change !!!!!!!!! - * @param targetMap all targets - * @return nil - */ -define map add_main_dev_to_partition_map( map<string,map> targetMap ) - ``{ - foreach( string targetdevice, map target, targetMap, - ``{ - targetMap[targetdevice,"partitions"] = - maplist( map p, target["partitions"]:[], - ``({ - if( size(p["used_by"]:"")>0 ) - { - p["main_dev"] = targetdevice; - } - return( p ); - })); - }); - y2debug("targets %1", targetMap ); - return( targetMap ); - }; - -/** - * @return list a list with all partition that have a key raid_name != "". - * @param targetMap all targets - */ -define list<map> all_raid_partitions( map<string,map> targetMap ) - ``{ - list<list> ret = - (list<list>) maplist( string targetdevice, map target, targetMap, - ``( filter( map part, target["partitions"]:[], - ``(part["used_by_type"]:`UB_NONE==`UB_MD)))); - return(list<map>)( flatten(ret) ); - }; - -define boolean check_raid_possible( map<string,map> targetMap ) - ``{ - integer possible_parts_found = size(get_possible_rds(targetMap)); - - if( possible_parts_found < 2 ) - { - // Translators: the text 'do not format' must match the label in the corresponding popup! - Popup::Message(_("To use RAID, at least two partitions of type 0xFD (or 0x83) -are required. Change your partition table accordingly. -In most cases, this can be done in the following way: -click 'Create', select 'Do not format', and set the File System ID to 0xFD. -")); - - return false; - } - return true; - } - } -- 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] r52707 - /trunk/storage/storage/src/include/custom_part_dialogs.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 18:20:23 2008 New Revision: 52707 URL: http://svn.opensuse.org/viewcvs/yast?rev=52707&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Wed Oct 29 18:20:23 2008 @@ -31,10 +31,6 @@ import "Label"; import "Popup"; - ////////////////////////////////////////////////////////////////////////////// - // Dialog Password for Crypted FS - ////////////////////////////////////////////////////////////////////////////// - include "partitioning/partition_defines.ycp"; include "partitioning/custom_part_helptexts.ycp"; @@ -1085,80 +1081,6 @@ } - -define term RaidOptionsDlg( map new_val, boolean edit_raid_type ) - ``{ - integer chunk_size = new_val["chunk_size"]:0; - string parity_algorithm = new_val["parity_algorithm"]:"left_asymmetric"; - string raid_type = new_val["raid_type"]:"raid1"; - term editRaid = `VSpacing(1); - - // 4KB .. 4096KB - list chunk_list = []; - integer i = 4; - while( i <= 4096 ) - { - integer chunk_item = i; - chunk_list = add( chunk_list, - `item(`id(chunk_item), tostring(chunk_item), - chunk_size==chunk_item )); - i = i*2; - } - - if( edit_raid_type ) - { - editRaid = `VBox( - `VSpacing(), - `Left (`ComboBox( `id(`raid_combo), - `opt(`notify, `hstretch ), - // button text - _("RAID T&ype"), - [ `item(`id("raid0"), "raid0", - "raid0"==raid_type ), - `item(`id("raid1"), "raid1", - "raid1"==raid_type ), - `item(`id("raid5"), "raid5", - "raid5"==raid_type ), - `item(`id("multipath"), "multipath", - "multipath"==raid_type ) - ])), - `VSpacing() - ); - } - - return `VSquash( - `VBox( - editRaid, - // Raid combobox description (don't translate to much ..) - `Left (`ComboBox ( `id(`chunk_size),`opt(`hstretch ), _("Chunk s&ize in KB"), chunk_list )), - `VSpacing (), - // Raid combobox description (don't translate to much ..) - `Left (`ComboBox ( `id(`parity),`opt(`hstretch ), _("Parity &algorithm (only for RAID 5)"), - [ `item(`id("left_asymmetric"), "left-asymmetric", "left_asymmetric" == parity_algorithm ), - `item(`id("left_symmetric"), "left-symmetric", "left_symmetric" == parity_algorithm ), - `item(`id("right_asymmetric"), "right-asymmetric", "right_asymmetric" == parity_algorithm ), - `item(`id("right_symmetric"), "right-symmetric", "right_symmetric" == parity_algorithm ) - ])), - `VSpacing () - )); - - } - -define term LoopOptionsDlg( string pb, string cb, string sb ) - ``{ - term widget = - `VSquash( - `VBox( - `VSpacing(), - `Left( `TextEntry( `id(`loop_path), `opt(`notify), pb )), - `VSpacing(1), - `Left( `CheckBox( `id(`loop_create), `opt(`notify), cb )), - `Left( `TextEntry( `id(`loop_size), `opt(`notify), sb )), - `VSpacing() - )); - return widget; - } - /** * Change the state of all symbol from the list symbols * @parm symbols all symbols @@ -1174,24 +1096,6 @@ /** - * Return a map with the filesystem definitions for the map new_val - * @parm new_val map that contains a partition - * @parm file_systems filesystem definitions - * @return map - */ -define map GetFirstFilesystemDefinition( integer fsid, map<symbol,map> file_systems ) - ``{ - map<symbol,map> define_map = filter( symbol key, map val, file_systems, - ``(fsid == val[`fsid]:Partitions::fsid_native )); - list<map> define_list = maplist( symbol k, map v , define_map, ``( v )); - if( size( define_list ) == 0) - return $[]; - else - return define_list[0]:$[]; - } - - - /** * Dialogpart: Mount part * @parm new_val map that contains a partition * @parm file_systems filesystem definitions -- 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] r52706 - /tags/stable-2_17_7/nfs-client/
by kmachalkova＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: kmachalkova Date: Wed Oct 29 18:17:21 2008 New Revision: 52706 URL: http://svn.opensuse.org/viewcvs/yast?rev=52706&view=rev Log: Created tag stable-2_17_7 for nfs-client Added: tags/stable-2_17_7/nfs-client/ - copied from r52705, trunk/nfs-client/ -- 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] r52705 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes
by kmachalkova＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: kmachalkova Date: Wed Oct 29 18:17:13 2008 New Revision: 52705 URL: http://svn.opensuse.org/viewcvs/yast?rev=52705&view=rev Log: version 2.17.7 Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=52705&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Wed Oct 29 18:17:13 2008 @@ -1 +1 @@ -2.17.6 +2.17.7 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Wed Oct 29 18:17:13 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Oct 29 18:12:10 CET 2008 - kmachalkova(a)suse.cz + +- Correct enabling/disabling of edit and delete buttons depending + on # of NFS shares (bnc#438665) +- Initialize only non-fstab NFS settings (firewall, sysconfig, idmapd) + if the client is run embedded in the partitioner (bnc#436897) +- 2.17.7 + +------------------------------------------------------------------- Mon Oct 20 12:42:47 CEST 2008 - kmachalkova(a)suse.cz - Un-HTML-ize help text (bnc#432800) -- 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] r52704 - /trunk/storage/package/yast2-storage.changes
by kmachalkova＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: kmachalkova Date: Wed Oct 29 18:10:49 2008 New Revision: 52704 URL: http://svn.opensuse.org/viewcvs/yast?rev=52704&view=rev Log: changelog up Modified: trunk/storage/package/yast2-storage.changes Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Oct 29 18:10:49 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 29 18:08:53 CET 2008 - kmachalkova(a)suse.cz + +- Initialize non-fstab settings of NFS on creating NFS panel - this + also covers installation of needed packages (bnc#436897) + +------------------------------------------------------------------- Wed Oct 29 14:29:52 CET 2008 - aschnell(a)suse.de - fixed crypt file setup (bnc #433484) -- 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] r52703 - /trunk/storage/storage/src/include/ep-nfs.ycp
by kmachalkova＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: kmachalkova Date: Wed Oct 29 18:08:02 2008 New Revision: 52703 URL: http://svn.opensuse.org/viewcvs/yast?rev=52703&view=rev Log: Initialize non-fstab settings of NFS on creating NFS panel - this also covers needed packages installation (#436897) Modified: trunk/storage/storage/src/include/ep-nfs.ycp Modified: trunk/storage/storage/src/include/ep-nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-n… ============================================================================== --- trunk/storage/storage/src/include/ep-nfs.ycp (original) +++ trunk/storage/storage/src/include/ep-nfs.ycp Wed Oct 29 18:08:02 2008 @@ -14,7 +14,7 @@ //boolean initialized = false; map <string, map> target_map = $[]; - map <string, integer> index = $[]; + boolean already_initialized = false; void CreateNfsMainPanel(any user_data) { @@ -74,6 +74,13 @@ y2milestone("Found NFS shares: %1", nfs_list); + if( !Stage::initial() && !already_initialized ) + { + y2milestone("Reading NFS settings"); + WFM::CallFunction("nfs-client4part", ["Read"]); + already_initialized = true; + } + } @@ -170,6 +177,9 @@ default: break; } + + //FIXME: Take care that non-fstab settings of nfs-client + //(firewall, sysconfig, idmapd) get written on closing partitioner } void CreateNfsPanel(any user_data) -- 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] r52702 - in /trunk/nfs-client/src: Nfs.ycp nfs-client4part.ycp
by kmachalkova＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: kmachalkova Date: Wed Oct 29 17:59:31 2008 New Revision: 52702 URL: http://svn.opensuse.org/viewcvs/yast?rev=52702&view=rev Log: Initialize non-fstab NFS settings (firewall, sysconfig, idmapd) if the client is run embedded in the partitioner (#436897) Modified: trunk/nfs-client/src/Nfs.ycp trunk/nfs-client/src/nfs-client4part.ycp Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=52702… ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Wed Oct 29 17:59:31 2008 @@ -36,6 +36,9 @@ /* default value of settings modified */ global boolean modified = false; + /* Should fstab reading be skipped ? (yes if we're + embedded in partitioner) */ + global boolean skip_fstab = false; /** * Function sets internal variable, which indicates, that any @@ -245,22 +248,29 @@ * @return true on success */ global define boolean Read () ``{ - list<map<string,any> > fstab = (list<map<string,any> >) SCR::Read (.etc.fstab); - fstab = UnescapeSpaces (fstab); - y2milestone ("fstab: %1", fstab); - // For simplicity, this leaves also the unused fileds in the maps. - nfs_entries = filter (map<string,any> entry, fstab, ``{ - return (entry["vfstype"]:"" == "nfs" || entry["vfstype"]:"" == "nfs4"); - }); - non_nfs_entries = filter (map entry, fstab, ``{ - return (entry["vfstype"]:"" != "nfs"); - }); + //Read /etc/fstab if we're running standalone (otherwise, libstorage does the job) + if( !skip_fstab ) + { + list<map<string,any> > fstab = (list<map<string,any> >) SCR::Read (.etc.fstab); + fstab = UnescapeSpaces (fstab); + y2milestone ("fstab: %1", fstab); + + // For simplicity, this leaves also the unused fileds in the maps. + nfs_entries = filter (map<string,any> entry, fstab, ``{ + return (entry["vfstype"]:"" == "nfs" || entry["vfstype"]:"" == "nfs4"); + }); + non_nfs_entries = filter (map entry, fstab, ``{ + return (entry["vfstype"]:"" != "nfs"); + }); + } nfs4_enabled = (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes"); idmapd_domain = (string) SCR::Read(.etc.idmapd_conf, "Domain"); + boolean progress_orig = Progress::set(false); SuSEFirewall::Read (); + Progress::set(progress_orig); portmapper = FindPortmapper(); //There is neither rpcbind nor portmap Modified: trunk/nfs-client/src/nfs-client4part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/nfs-client4part.y… ============================================================================== --- trunk/nfs-client/src/nfs-client4part.ycp (original) +++ trunk/nfs-client/src/nfs-client4part.ycp Wed Oct 29 17:59:31 2008 @@ -56,18 +56,22 @@ "mntops": entry["fstopt"]:"" ]); }); - y2milestone("jezibaba %1", Nfs::nfs_entries); + y2milestone("Nfs shares imported from storage %1", Nfs::nfs_entries); nfs_entries = Nfs::nfs_entries; InitFstabEntries(); } + else if (func == "Read") + { + Nfs::skip_fstab = true; + Nfs::Read(); + } else if (func == "HandleEvent") { any widget_id = param["widget_id"]:nil; list <symbol> w_ids = [ `newbut, `editbut, `delbut ]; HandleEvent( widget_id); - y2milestone("jezibaba %1", nfs_entries); y2milestone("%1", modify_line); Nfs::nfs_entries = nfs_entries; -- 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] r52701 - /trunk/storage/storage/src/include/lvm_ui_lib.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 17:50:12 2008 New Revision: 52701 URL: http://svn.opensuse.org/viewcvs/yast?rev=52701&view=rev Log: - removed crap Modified: trunk/storage/storage/src/include/lvm_ui_lib.ycp Modified: trunk/storage/storage/src/include/lvm_ui_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_ui_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_ui_lib.ycp Wed Oct 29 17:50:12 2008 @@ -29,16 +29,6 @@ ////////////////////////////////////////////////////////////////////// -// helptext for dialog createEditLogicaVolume -////////////////////////////////////////////////////////////////////// - -define string getCreateEditLogicaVolumeHelptext() - ``{ - string help_text = "cstein"; - return( help_text ); - }; - -////////////////////////////////////////////////////////////////////// // helptext for logical volume ////////////////////////////////////////////////////////////////////// -- 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] r52700 - /tags/stable-2_17_4/wagon/
by locilka＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: locilka Date: Wed Oct 29 17:40:09 2008 New Revision: 52700 URL: http://svn.opensuse.org/viewcvs/yast?rev=52700&view=rev Log: Created tag stable-2_17_4 for wagon Added: tags/stable-2_17_4/wagon/ - copied from r52699, trunk/wagon/ -- 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] r52699 - in /trunk/wagon: VERSION package/yast2-wagon.changes
by locilka＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: locilka Date: Wed Oct 29 17:39:56 2008 New Revision: 52699 URL: http://svn.opensuse.org/viewcvs/yast?rev=52699&view=rev Log: 2.17.4 Modified: trunk/wagon/VERSION trunk/wagon/package/yast2-wagon.changes Modified: trunk/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/VERSION?rev=52699&r1=52698… ============================================================================== --- trunk/wagon/VERSION (original) +++ trunk/wagon/VERSION Wed Oct 29 17:39:56 2008 @@ -1 +1 @@ -2.17.3 +2.17.4 Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Oct 29 17:39:56 2008 @@ -7,6 +7,7 @@ - Fixed Provides for PatchCD desktop file - it was owned by yast2-online-update-frontend. - Storing sources when restarting or correctly finishing wagon. +- 2.17.4 ------------------------------------------------------------------- Mon Oct 27 12:52:02 CET 2008 - locilka(a)suse.cz -- 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] r52698 - /trunk/storage/storage/src/include/target_modify.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 17:38:55 2008 New Revision: 52698 URL: http://svn.opensuse.org/viewcvs/yast?rev=52698&view=rev Log: - removed obsolete file Removed: trunk/storage/storage/src/include/target_modify.ycp -- 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] r52697 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 17:12:47 2008 New Revision: 52697 URL: http://svn.opensuse.org/viewcvs/yast?rev=52697&view=rev Log: - some cleanup Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Oct 29 17:12:47 2008 @@ -4156,22 +4156,6 @@ } - - - - /* maindevkey = all | maindevkey - what = "all" | - "assigned_raid" | "assigned_vg" | "not_assigned" | "assigned" - "delete" | "no_delete" - "edit_possible" | "delete_possible" | - "display_possible" | - "assign_raid_possible" | "assign_vg_possible" - "no_virtal" | "virtual" - how = "all" | "key_list" | "index_list" ( raid_lib -> get_possible_rds ) - */ - - - // TODO: remove /* Contain the current key ( subdevkey ) for all wizards */ string WizardKey = ""; @@ -4913,6 +4897,8 @@ return( ret ); } + +/* global define boolean DiskmapNeeded() ``{ boolean ret = false; @@ -4956,8 +4942,10 @@ scsi_disk ); return( ret ); }; +*/ +/* global define list<string> GetDirPatterns( string dir, list patterns ) ``{ list<string> ret = []; @@ -4971,6 +4959,8 @@ y2milestone( "ret %1", ret ); return( ret ); } +*/ + global define map GetBootPartition( string disk ) ``{ -- 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] r52696 - /trunk/pkg-bindings/src/Package.cc
by locilka＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: locilka Date: Wed Oct 29 17:08:49 2008 New Revision: 52696 URL: http://svn.opensuse.org/viewcvs/yast?rev=52696&view=rev Log: A bit more readable docu Modified: trunk/pkg-bindings/src/Package.cc Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Wed Oct 29 17:08:49 2008 @@ -1505,54 +1505,57 @@ /** * @builtin PkgUpdateAll - * @param map<string,any> update_options Options for the solver. All parameters are optional, if a parameter is missing the default value from the package manager (libzypp) is used. Currently supported options: <tt>$["silent_downgrades":boolean] </tt> + * @param map<string,any> update_options Options for the solver. All parameters are optional, + * if a parameter is missing the default value from the package manager (libzypp) is used. + * Currently supported options: <tt>$["silent_downgrades":boolean] </tt> + * * @short Update installed packages * @description * Mark all packages for installation which are installed and have * an available candidate for update. - * + * * This will mark packages for installation *and* for deletion (if a * package provides/obsoletes another package) - * + * * This function does not solve dependencies. - * + * * Symbols and integer values returned: - * + * * ProblemListSze: Number of taboo and dropped packages found. - * + * * DeleteUnmaintained: Whether delete_unmaintained arg was true or false. * Dependent on this, SumDropped below either denotes packages to delete * (if true) or packages to keep (if false). - * + * * SumProcessed: TOTAL number of installed packages we processed. - * + * * SumToInstall: TOTAL number of packages now tagged as to install. * Summs Ipreselected, Iupdate, Idowngrade, Ireplaced. - * + * * Ipreselected: Packages which were already taged to install. - * + * * Iupdate: Packages set to install as update to a newer version. - * + * * Idowngrade: Packages set to install performing a version downgrade. - * + * * Ireplaced: Packages set to install as they replace an installed package. - * + * * SumToDelete: TOTAL number of packages now tagged as to delete. * Summs Dpreselected, SumDropped if DeleteUnmaintained * was set. - * + * * Dpreselected: Packages which were already taged to delete. - * + * * SumToKeep: TOTAL number of packages which remain unchanged. * Summs Ktaboo, Knewer, Ksame, SumDropped * if DeleteUnmaintained was not set. - * + * * Ktaboo: Packages which are set taboo. - * + * * Knewer: Packages kept because only older versions are available. - * + * * Ksame: Packages kept because they are up to date. - * + * * SumDropped: TOTAL number of dropped packages found. Dependent * on the delete_unmaintained arg, they are either tagged as to delete or * remain unchanged. -- 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] r52695 - in /trunk/theme/openSUSE/icons: 16x16/apps/yast-xen-dirinstall.png 22x22/apps/yast-xen-dirinstall.png 32x32/apps/yast-xen-dirinstall.png 48x48/apps/yast-xen-dirinstall.png
by jimmacfx＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jimmacfx Date: Wed Oct 29 17:08:20 2008 New Revision: 52695 URL: http://svn.opensuse.org/viewcvs/yast?rev=52695&view=rev Log: replace crystal icon Added: trunk/theme/openSUSE/icons/16x16/apps/yast-xen-dirinstall.png (with props) Modified: trunk/theme/openSUSE/icons/22x22/apps/yast-xen-dirinstall.png trunk/theme/openSUSE/icons/32x32/apps/yast-xen-dirinstall.png trunk/theme/openSUSE/icons/48x48/apps/yast-xen-dirinstall.png Added: trunk/theme/openSUSE/icons/16x16/apps/yast-xen-dirinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/16x16/apps/… ============================================================================== Binary file - no diff available. Modified: trunk/theme/openSUSE/icons/22x22/apps/yast-xen-dirinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/32x32/apps/yast-xen-dirinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/48x48/apps/yast-xen-dirinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Binary files - no diff available. -- 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] r52694 - in /trunk/wagon: package/yast2-wagon.changes src/clients/wagon.ycp src/modules/Wagon.ycp
by locilka＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: locilka Date: Wed Oct 29 17:06:23 2008 New Revision: 52694 URL: http://svn.opensuse.org/viewcvs/yast?rev=52694&view=rev Log: - Storing sources when restarting or correctly finishing wagon. Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon.ycp trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Oct 29 17:06:23 2008 @@ -6,6 +6,7 @@ - Remembering and reusing adjusted wagon workflow. - Fixed Provides for PatchCD desktop file - it was owned by yast2-online-update-frontend. +- Storing sources when restarting or correctly finishing wagon. ------------------------------------------------------------------- Mon Oct 27 12:52:02 CET 2008 - locilka(a)suse.cz Modified: trunk/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/clients/wagon.ycp (original) +++ trunk/wagon/src/clients/wagon.ycp Wed Oct 29 17:06:23 2008 @@ -25,6 +25,7 @@ import "Wagon"; import "CommandLine"; import "PackageLock"; + import "PackageCallbacks"; textdomain "wagon"; @@ -90,11 +91,17 @@ y2milestone ("YaST will be restarted starting from the very next step: %1", next_step); SCR::Write (.target.ycp, current_step_file, next_step); + // Also the current workflow type has to be stored string current_workflow = Wagon::GetUpdateWorkflow(); y2milestone ("Current workflow is '%1'", current_workflow); SCR::Write (.target.ycp, current_workflow_file, current_workflow); } } + + if (ret == `restart_same_step || ret == `restart_yast || ret == `reboot || ret == `accept || ret == `next) { + y2milestone ("Storing all the current sources..."); + Pkg::SourceSaveAll(); + } } // Checks whether YaST has been restarted Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Wed Oct 29 17:06:23 2008 @@ -265,8 +265,10 @@ return true; } - map <symbol, integer> update_sum = Pkg::PkgUpdateAll (GetUpdateConf()); - y2milestone ("Update summary: %1", update_sum); + map <string, any> update_conf = GetUpdateConf(); + + map <symbol, integer> update_sum = Pkg::PkgUpdateAll (update_conf); + y2milestone ("Update configuration: %1, update summary: %2", update_conf, update_sum); already_proposed = true; -- 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] r52693 - /tags/branch-SLE-10-SP3-2_13_33/printer/
by mzugec＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mzugec Date: Wed Oct 29 16:57:04 2008 New Revision: 52693 URL: http://svn.opensuse.org/viewcvs/yast?rev=52693&view=rev Log: Created tag branch-SLE-10-SP3-2_13_33 for printer Added: tags/branch-SLE-10-SP3-2_13_33/printer/ - copied from r52692, branches/SuSE-SLE-10-SP3-Branch/printer/ -- 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] r52692 - /tags/branch-SLE-10-SP3-2_13_33/
by mzugec＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mzugec Date: Wed Oct 29 16:57:01 2008 New Revision: 52692 URL: http://svn.opensuse.org/viewcvs/yast?rev=52692&view=rev Log: Created tag branch-SLE-10-SP3-2_13_33 Added: tags/branch-SLE-10-SP3-2_13_33/ -- 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] r52691 - in /branches/SuSE-SLE-10-SP3-Branch/printer: VERSION package/yast2-printer.changes src/modules/Printerlib.ycp
by mzugec＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: mzugec Date: Wed Oct 29 16:56:50 2008 New Revision: 52691 URL: http://svn.opensuse.org/viewcvs/yast?rev=52691&view=rev Log: correct parsing of socket URI (bnc#431209) Modified: branches/SuSE-SLE-10-SP3-Branch/printer/VERSION branches/SuSE-SLE-10-SP3-Branch/printer/package/yast2-printer.changes branches/SuSE-SLE-10-SP3-Branch/printer/src/modules/Printerlib.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/printe… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/printer/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/printer/VERSION Wed Oct 29 16:56:50 2008 @@ -1 +1 @@ -2.13.32 +2.13.33 Modified: branches/SuSE-SLE-10-SP3-Branch/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/printe… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/printer/package/yast2-printer.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/printer/package/yast2-printer.changes Wed Oct 29 16:56:50 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 29 17:54:47 CET 2008 - mzugec(a)suse.de + +- correct parsing of socket URI (bnc#431209) +- 2.14.33 + +------------------------------------------------------------------- Tue Jan 16 17:35:32 CET 2007 - mzugec(a)suse.de - #215251 - unpacked schema files (printer.rnc) Modified: branches/SuSE-SLE-10-SP3-Branch/printer/src/modules/Printerlib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/printe… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/printer/src/modules/Printerlib.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/printer/src/modules/Printerlib.ycp Wed Oct 29 16:56:50 2008 @@ -554,6 +554,10 @@ if (size (uri_list) >= 3) return uri_list[1]:""; } + else if(getUriType(uri)=="socket"){ + list<string> uri_list=splitstring(dev, ":"); + return uri_list[0]:""; + } /* i = findfirstof (dev, "/"); if (nil != i) -- 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] r52690 - in /trunk/theme/openSUSE/icons: 22x22/apps/ 32x32/apps/ 48x48/apps/
by jimmacfx＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jimmacfx Date: Wed Oct 29 16:56:26 2008 New Revision: 52690 URL: http://svn.opensuse.org/viewcvs/yast?rev=52690&view=rev Log: use same metaphor as what openSUSE-Oxygen does Modified: trunk/theme/openSUSE/icons/22x22/apps/yast-remotechooser.png (contents, props changed) trunk/theme/openSUSE/icons/22x22/apps/yast-remoteinstall.png (contents, props changed) trunk/theme/openSUSE/icons/32x32/apps/yast-remotechooser.png (contents, props changed) trunk/theme/openSUSE/icons/32x32/apps/yast-remoteinstall.png (contents, props changed) trunk/theme/openSUSE/icons/48x48/apps/yast-remotechooser.png (contents, props changed) trunk/theme/openSUSE/icons/48x48/apps/yast-remoteinstall.png (contents, props changed) Modified: trunk/theme/openSUSE/icons/22x22/apps/yast-remotechooser.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/22x22/apps/yast-remoteinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/32x32/apps/yast-remotechooser.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/32x32/apps/yast-remoteinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/48x48/apps/yast-remotechooser.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/icons/48x48/apps/yast-remoteinstall.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Binary files - no diff available. -- 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] r52689 - in /trunk/support: package/yast2-support.changes src/Support.ycp src/dialogs.ycp
by jsrain＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jsrain Date: Wed Oct 29 16:56:14 2008 New Revision: 52689 URL: http://svn.opensuse.org/viewcvs/yast?rev=52689&view=rev Log: fixed passing root password to supportconfig if YaST is run as non-root Modified: trunk/support/package/yast2-support.changes trunk/support/src/Support.ycp trunk/support/src/dialogs.ycp Modified: trunk/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/package/yast2-support.ch… ============================================================================== --- trunk/support/package/yast2-support.changes (original) +++ trunk/support/package/yast2-support.changes Wed Oct 29 16:56:14 2008 @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Wed Oct 29 14:52:50 CET 2008 - jsrain(a)suse.cz +Wed Oct 29 16:55:40 CET 2008 - jsrain(a)suse.cz - issue a warning before starting browser as root +- fixed passing root password to supportconfig if YaST is run as + non-root ------------------------------------------------------------------- Wed Oct 29 14:07:23 CET 2008 - mzugec(a)suse.de Modified: trunk/support/src/Support.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/Support.ycp?rev=5268… ============================================================================== --- trunk/support/src/Support.ycp (original) +++ trunk/support/src/Support.ycp Wed Oct 29 16:56:14 2008 @@ -74,14 +74,16 @@ */ global string root_pw = nil; -global string pwd_pipe = nil; +global string pwd_file = nil; global boolean CheckRootPw (string pw) { - if (pwd_pipe == nil) - pwd_pipe = ((string)SCR::Read (.target.tmpdir) + "/pwd_pipe"); - SCR::Execute (.target.bash, "test -e %1 || mkfifo %1", pwd_pipe); - SCR::Write (.target.string, pwd_pipe, pw + "\n"); - integer exit = (integer)SCR::Execute (.target.bash, sformat ("cat %1 | su -c 'echo 0'", pwd_pipe)); + if (pwd_file == nil) + pwd_file = ((string)SCR::Read (.target.tmpdir) + "/pwd_file"); + SCR::Execute (.target.bash, sformat ("test -e %1 || touch %1", pwd_file)); + SCR::Execute (.target.bash, sformat ("chmod 600 %1", pwd_file)); + SCR::Write (.target.string, pwd_file, pw + "\n"); + integer exit = (integer)SCR::Execute (.target.bash, sformat ("cat %1 | su -c 'echo 0'", pwd_file)); + SCR::Write (.target.string, pwd_file, ""); boolean success = (exit == 0); y2milestone ("Root password check: %1", success); if (success) Modified: trunk/support/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/dialogs.ycp?rev=5268… ============================================================================== --- trunk/support/src/dialogs.ycp (original) +++ trunk/support/src/dialogs.ycp Wed Oct 29 16:56:14 2008 @@ -196,12 +196,14 @@ if (! Support::AskForRootPwd()) return `back; integer id = Support::WhoAmI(); - SCR::Write (.target.string, Support::pwd_pipe, Support::root_pw + "\n"); - command = sformat("cat %2 | su -c '%1'", command, Support::pwd_pipe); + SCR::Write (.target.string, Support::pwd_file, Support::root_pw + "\n"); + command = sformat("cat %2 | su -c '%1'", command, Support::pwd_file); } y2milestone("executing %1", command); map<string, any> output = (map<string, any>)SCR::Execute(.target.bash_output, command); y2milestone("output %1", output); + if (Support::WhoAmI() != 0) + SCR::Write (.target.string, Support::pwd_file, ""); if (output["exit"]:-1 != 0) Report::Error (sformat("%1 : %2",_("Cannot write settings"), output)); else{ command = sformat("find \"%1\" -type f -name \"%2*\"|tr -d '\n'", Support::log_files["tmp_dir"]:"", Support::log_files["log_dir"]:""); @@ -534,8 +536,8 @@ if (! Support::AskForRootPwd()) return `back; integer id = Support::WhoAmI(); - SCR::Write (.target.string, Support::pwd_pipe, Support::root_pw + "\n"); - cmd = sformat("cat %4 | su -c 'supportconfig %1 -t %2 && chown -R %3 %2'", Support::GetParameterList(), Support::log_files["tmp_dir"]:"", id, Support::pwd_pipe); + SCR::Write (.target.string, Support::pwd_file, Support::root_pw + "\n"); + cmd = sformat("cat %4 | su -c 'supportconfig %1 -t %2 && chown -R %3 %2'", Support::GetParameterList(), Support::log_files["tmp_dir"]:"", id, Support::pwd_file); } symbol ret = nil; integer pid = (integer) SCR::Execute(.process.start_shell, cmd); @@ -558,6 +560,8 @@ break; } } + if (Support::WhoAmI() != 0) + SCR::Write (.target.string, Support::pwd_file, ""); while(ret!=`back && ret!=`abort && ret!=`next){ ret = (symbol)UI::UserInput(); } -- 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] r52688 - in /trunk/wagon: package/yast2-wagon.changes yast2-wagon.spec.in
by locilka＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: locilka Date: Wed Oct 29 16:48:41 2008 New Revision: 52688 URL: http://svn.opensuse.org/viewcvs/yast?rev=52688&view=rev Log: - Fixed Provides for PatchCD desktop file - it was owned by yast2-online-update-frontend. Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/yast2-wagon.spec.in Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Oct 29 16:48:41 2008 @@ -4,6 +4,8 @@ - Restarting the very next step instead of the same step in case of restarting wagon after self-update (prevents from loop). - Remembering and reusing adjusted wagon workflow. +- Fixed Provides for PatchCD desktop file - it was owned by + yast2-online-update-frontend. ------------------------------------------------------------------- Mon Oct 27 12:52:02 CET 2008 - locilka(a)suse.cz Modified: trunk/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/yast2-wagon.spec.in?rev=52… ============================================================================== --- trunk/wagon/yast2-wagon.spec.in (original) +++ trunk/wagon/yast2-wagon.spec.in Wed Oct 29 16:48:41 2008 @@ -3,10 +3,10 @@ @HEADER@ # Possibility to restart YaST Requires: yast2 >= 2.17.33 -Requires: yast2-online-update >= 2.17.9 +Requires: yast2-online-update-frontend >= 2.17.9 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update -Provides: yast2-online-update:/usr/share/applications/YaST2/cd_update.desktop +Provides: yast2-online-update-frontend:/usr/share/applications/YaST2/cd_update.desktop BuildArchitectures: noarch -- 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] r52687 - in /trunk/wagon: package/yast2-wagon.changes src/clients/wagon.ycp src/clients/wagon_selfupdate.ycp src/clients/wagon_update_proposal.ycp
by locilka＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: locilka Date: Wed Oct 29 16:43:09 2008 New Revision: 52687 URL: http://svn.opensuse.org/viewcvs/yast?rev=52687&view=rev Log: - Restarting the very next step instead of the same step in case of restarting wagon after self-update (prevents from loop). - Remembering and reusing adjusted wagon workflow. Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon.ycp trunk/wagon/src/clients/wagon_selfupdate.ycp trunk/wagon/src/clients/wagon_update_proposal.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Oct 29 16:43:09 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 29 16:41:12 CET 2008 - locilka(a)suse.cz + +- Restarting the very next step instead of the same step in case of + restarting wagon after self-update (prevents from loop). +- Remembering and reusing adjusted wagon workflow. + +------------------------------------------------------------------- Mon Oct 27 12:52:02 CET 2008 - locilka(a)suse.cz - Calling inst_prepareprogress before inst_kickoff (bnc #438848). Modified: trunk/wagon/src/clients/wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/clients/wagon.ycp (original) +++ trunk/wagon/src/clients/wagon.ycp Wed Oct 29 16:43:09 2008 @@ -45,7 +45,11 @@ string do_restart = Directory::vardir + "/restart_yast"; - string current_step_file = Directory::vardir + "/current_workflow_step"; + // Start workflow from step ... + string current_step_file = Directory::vardir + "/wagon-current_workflow_step"; + // Start with workflow + string current_workflow_file = Directory::vardir + "/wagon-current_workflow_file"; + integer current_step = 0; string custom_workflow_file = "/usr/share/YaST2/control/online_migration.xml"; @@ -78,8 +82,17 @@ if (ret == `restart_same_step) { current_step = ProductControl::CurrentStep(); - y2milestone ("The same step will be restarted: %1", current_step); - SCR::Write (.target.ycp, current_step_file, current_step); + // We actually don't want to restart the same step, we want to continue + // directly with the very next step + // + // The current step + 1 == the very next step + integer next_step = current_step + 1; + y2milestone ("YaST will be restarted starting from the very next step: %1", next_step); + SCR::Write (.target.ycp, current_step_file, next_step); + + string current_workflow = Wagon::GetUpdateWorkflow(); + y2milestone ("Current workflow is '%1'", current_workflow); + SCR::Write (.target.ycp, current_workflow_file, current_workflow); } } } @@ -102,6 +115,18 @@ y2milestone ("Adjusting starting step: %1", current_step); } } + + if (FileUtils::Exists (current_workflow_file)) { + string workflow_type = (string) SCR::Read (.target.ycp, current_workflow_file); + SCR::Execute (.target.remove, current_workflow_file); + + if (workflow_type == nil || workflow_type == "") { + y2error ("Requested workflow type is invalid: %1", workflow_type); + } else { + y2milestone ("Adjusting required workflow type: %1", workflow_type); + Wagon::SetUpdateWorkflow (workflow_type); + } + } } } Modified: trunk/wagon/src/clients/wagon_selfupdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_selfupda… ============================================================================== --- trunk/wagon/src/clients/wagon_selfupdate.ycp (original) +++ trunk/wagon/src/clients/wagon_selfupdate.ycp Wed Oct 29 16:43:09 2008 @@ -164,6 +164,7 @@ } } + y2milestone ("Selected resolvables: %1", selected); if (selected < 1) { y2milestone ("Neither patches nor packages for self-update have been selected"); return ret; @@ -178,10 +179,12 @@ // PkgSolve didn't report any problem if (solved) { + y2milestone ("Solved automatically"); // FIXME: inform user? ret = `restart_same_step; // There are some issues in selecting the patches } else { + y2milestone ("Cannot be solved automatically"); while (true) { // Try to solve them manually UI::OpenDialog(`opt(`defaultsize), `PackageSelector (`id(`selector), `opt(`summaryMode))); @@ -209,7 +212,7 @@ } // Solved manually } else if (ret_sel == `accept) { - ret = `restart_same_step; + solved = true; break; } } @@ -228,11 +231,20 @@ } if (solved == true) { - y2milestone ("Calling update..."); - OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); - any ret = WFM::call ("online_update_install"); - y2milestone ("Update returned: %1", ret); + // Solver ends with some resolvables changed + if (Pkg::IsAnyResolvable (`any, `to_install) == true || Pkg::IsAnyResolvable (`any, `to_remove) == true) { + y2milestone ("Calling update..."); + OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); + any oui_ret = WFM::call ("online_update_install"); + y2milestone ("Update returned: %1", oui_ret); + ret = `restart_same_step; + } else { + y2milestone ("Nothing to install/remove"); + ret = `auto; + } } + y2milestone ("Returning: %1", ret); + return ret; } Modified: trunk/wagon/src/clients/wagon_update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_update_p… ============================================================================== --- trunk/wagon/src/clients/wagon_update_proposal.ycp (original) +++ trunk/wagon/src/clients/wagon_update_proposal.ycp Wed Oct 29 16:43:09 2008 @@ -26,6 +26,9 @@ map <string, any> ret = $[]; if (func == "MakeProposal") { + // Make sure the packager is initialized + Wagon::InitPkg(); + boolean force_reset = param["force_reset" ]:false; boolean language_changed = param["language_changed"]:false; -- 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] r52686 - /trunk/gtk/yast2-gtk.spec.in
by michael_meeks＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: michael_meeks Date: Wed Oct 29 16:37:13 2008 New Revision: 52686 URL: http://svn.opensuse.org/viewcvs/yast?rev=52686&view=rev Log: package the artwork too Modified: trunk/gtk/yast2-gtk.spec.in Modified: trunk/gtk/yast2-gtk.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/yast2-gtk.spec.in?rev=52686&… ============================================================================== --- trunk/gtk/yast2-gtk.spec.in (original) +++ trunk/gtk/yast2-gtk.spec.in Wed Oct 29 16:37:13 2008 @@ -61,5 +61,5 @@ %doc @docdir@ %{_libdir}/YaST2/plugin/libpy2gtk.so.* %{_libdir}/YaST2/plugin/libpy2gtk.so - - +%{_datadir}/YaST2/gtk/*.png +%{_datadir}/YaST2/gtk/*.xpm -- 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] r52685 - in /trunk/storage/libstorage/src: Loop.cc LoopCo.cc
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 16:34:35 2008 New Revision: 52685 URL: http://svn.opensuse.org/viewcvs/yast?rev=52685&view=rev Log: - some cleanup Modified: trunk/storage/libstorage/src/Loop.cc trunk/storage/libstorage/src/LoopCo.cc Modified: trunk/storage/libstorage/src/Loop.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Loop.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Loop.cc (original) +++ trunk/storage/libstorage/src/Loop.cc Wed Oct 29 16:34:35 2008 @@ -18,15 +18,16 @@ using namespace storage; using namespace std; -Loop::Loop( const LoopCo& d, const string& LoopDev, const string& LoopFile, - bool dmcrypt, const string& dm_dev, - ProcPart& ppart, SystemCmd& losetup ) : - Volume( d, 0, 0 ) - { - y2milestone( "constructed loop dev:%s file:%s dmcrypt:%d dmdev:%s", - LoopDev.c_str(), LoopFile.c_str(), dmcrypt, dm_dev.c_str() ); + +Loop::Loop(const LoopCo& d, const string& LoopDev, const string& LoopFile, + bool dmcrypt, const string& dm_dev, ProcPart& ppart, + SystemCmd& losetup) + : Volume(d, 0, 0) +{ + y2mil("constructed loop dev:" << LoopDev << " file:" << LoopFile << + " dmcrypt:" << dmcrypt << " dmdev:" << dm_dev); if( d.type() != LOOP ) - y2error( "constructed loop with wrong container" ); + y2err("constructed loop with wrong container"); init(); lfile = LoopFile; loop_dev = fstab_loop_dev = LoopDev; @@ -73,15 +74,17 @@ if( stat( lfile.c_str(), &st )>=0 ) setSize( st.st_size/1024 ); } - } +} -Loop::Loop( const LoopCo& d, const string& file, bool reuseExisting, - unsigned long long sizeK, bool dmcr ) : Volume( d, 0, 0 ) - { - y2milestone( "constructed loop file:%s reuseExisting:%d sizek:%llu dmcrypt:%d", - file.c_str(), reuseExisting, sizeK, dmcr ); + +Loop::Loop(const LoopCo& d, const string& file, bool reuseExisting, + unsigned long long sizeK, bool dmcr) + : Volume(d, 0, 0) +{ + y2mil("constructed loop file:" << file << " reuseExisting:" << reuseExisting << + " sizek:" << sizeK << " dmcrypt:" << dmcr); if( d.type() != LOOP ) - y2error( "constructed loop with wrong container" ); + y2err("constructed loop with wrong container"); init(); reuseFile = reuseExisting; lfile = file; @@ -107,12 +110,14 @@ checkReuse(); if( !reuseFile ) setSize( sizeK ); - } +} + Loop::~Loop() - { - y2debug( "destructed loop %s", dev.c_str() ); - } +{ + y2deb("destructed loop " << dev); +} + void Loop::init() @@ -191,7 +196,7 @@ return( ret ); } -string +string Loop::lfileRealPath() const { return( cont->getStorage()->root() + lfile ); @@ -281,7 +286,7 @@ // %4$s is replaced by file system type (e.g. reiserfs) // %5$s is replaced by mount point (e.g. /usr) txt = sformat( _("Create file-based device %1$s of file %2$s (%3$s) as %5$s with %4$s"), - d.c_str(), lfile.c_str(), sizeString().c_str(), + d.c_str(), lfile.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } else @@ -292,7 +297,7 @@ // %4$s is replaced by file system type (e.g. reiserfs) // %5$s is replaced by mount point (e.g. /usr) txt = sformat( _("Create encrypted file-based device %1$s of file %2$s (%3$s) as %5$s with %4$s"), - d.c_str(), lfile.c_str(), sizeString().c_str(), + d.c_str(), lfile.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } } @@ -320,7 +325,7 @@ // %3$s is replaced by size (e.g. 623.5 MB) // %4$s is replaced by file system type (e.g. reiserfs) txt = sformat( _("Formatting file-based device %1$s of %2$s (%3$s) with %4$s "), - d.c_str(), lfile.c_str(), sizeString().c_str(), + d.c_str(), lfile.c_str(), sizeString().c_str(), fsTypeString().c_str() ); } else @@ -338,7 +343,7 @@ // %4$s is replaced by file system type (e.g. reiserfs) // %5$s is replaced by mount point (e.g. /usr) txt = sformat( _("Format file-based device %1$s of %2$s (%3$s) as %5$s with %4$s"), - d.c_str(), lfile.c_str(), sizeString().c_str(), + d.c_str(), lfile.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } else @@ -349,7 +354,7 @@ // %4$s is replaced by file system type (e.g. reiserfs) // %5$s is replaced by mount point (e.g. /usr) txt = sformat( _("Format encrypted file-based device %1$s of %2$s (%3$s) as %5$s with %4$s"), - d.c_str(), lfile.c_str(), sizeString().c_str(), + d.c_str(), lfile.c_str(), sizeString().c_str(), fsTypeString().c_str(), mp.c_str() ); } } @@ -360,7 +365,7 @@ // %3$s is replaced by size (e.g. 623.5 MB) // %4$s is replaced by file system type (e.g. reiserfs) txt = sformat( _("Format file-based device %1$s of %2$s (%3$s) with %4$s"), - d.c_str(), lfile.c_str(), sizeString().c_str(), + d.c_str(), lfile.c_str(), sizeString().c_str(), fsTypeString().c_str() ); } } @@ -395,7 +400,7 @@ bool Loop::equalContent( const Loop& rhs ) const { return( Volume::equalContent(rhs) && - lfile==rhs.lfile && reuseFile==rhs.reuseFile && + lfile==rhs.lfile && reuseFile==rhs.reuseFile && delFile==rhs.delFile ); } @@ -421,21 +426,24 @@ y2mil(log); } -Loop& Loop::operator= ( const Loop& rhs ) - { - y2debug( "operator= from %s", rhs.nm.c_str() ); + +Loop& Loop::operator=(const Loop& rhs) +{ + y2deb("operator= from " << rhs.nm); *((Volume*)this) = rhs; lfile = rhs.lfile; reuseFile = rhs.reuseFile; delFile = rhs.delFile; - return( *this ); - } + return *this; +} -Loop::Loop( const LoopCo& d, const Loop& rhs ) : Volume(d) - { - y2debug( "constructed loop by copy constructor from %s", rhs.nm.c_str() ); + +Loop::Loop(const LoopCo& d, const Loop& rhs) + : Volume(d) +{ + y2deb("constructed loop by copy constructor from " << rhs.nm); *this = rhs; - } +} -unsigned Loop::loop_major = 0; +unsigned Loop::loop_major = 0; Modified: trunk/storage/libstorage/src/LoopCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LoopCo.cc… ============================================================================== --- trunk/storage/libstorage/src/LoopCo.cc (original) +++ trunk/storage/libstorage/src/LoopCo.cc Wed Oct 29 16:34:35 2008 @@ -18,26 +18,30 @@ using namespace storage; using namespace std; -LoopCo::LoopCo( Storage * const s, bool detect, ProcPart& ppart ) : - Container(s,"loop",staticType()) - { - y2debug( "constructing LoopCo detect:%d", detect ); + +LoopCo::LoopCo(Storage * const s, bool detect, ProcPart& ppart) + : Container(s, "loop", staticType()) +{ + y2deb("constructing LoopCo detect:" << detect); init(); if( detect ) getLoopData( ppart ); - } +} -LoopCo::LoopCo( Storage * const s, const string& file ) : - Container(s,"loop",staticType()) - { - y2debug( "constructing LoopCo file:%s", file.c_str() ); + +LoopCo::LoopCo(Storage * const s, const string& file) + : Container(s, "loop", staticType()) +{ + y2deb("constructing LoopCo file:" << file); init(); - } +} + LoopCo::~LoopCo() - { - y2debug( "destructed LoopCo" ); - } +{ + y2deb("destructed LoopCo"); +} + void LoopCo::init() @@ -68,7 +72,7 @@ y2warning( "file %s not existent or special", lfile.c_str() ); else { - Loop *l = new Loop( *this, i->loop_dev, lfile, + Loop *l = new Loop( *this, i->loop_dev, lfile, i->dmcrypt, !i->noauto?i->dentry:"", ppart, c ); l->setEncryption( i->encr ); @@ -92,10 +96,10 @@ { getStorage()->findDmUsing( i->loopDevice(), dm ); } - if( dm==0 && !i->getMount().empty() && + if( dm==0 && !i->getMount().empty() && !mp[i->getMount()].empty() ) { - y2mil( "mp:" << i->getMount() << " dev:" << + y2mil( "mp:" << i->getMount() << " dev:" << mp[i->getMount()] ); getStorage()->findDm( mp[i->getMount()], dm ); } @@ -197,11 +201,11 @@ } int -LoopCo::updateLoop( const string& device, const string& file, +LoopCo::updateLoop( const string& device, const string& file, bool reuseExisting, unsigned long long sizeK ) { int ret = 0; - y2milestone( "device:%s file:%s reuse:%d sizeK:%lld", device.c_str(), + y2milestone( "device:%s file:%s reuse:%d sizeK:%lld", device.c_str(), file.c_str(), reuseExisting, sizeK ); LoopIter i; if( readonly() ) @@ -409,16 +413,16 @@ return( ret ); } -LoopCo::LoopCo( const LoopCo& rhs ) : Container(rhs) - { - y2debug( "constructed LoopCo by copy constructor from %s", rhs.nm.c_str() ); + +LoopCo::LoopCo(const LoopCo& rhs) + : Container(rhs) +{ + y2deb("constructed LoopCo by copy constructor from " << rhs.nm); *this = rhs; ConstLoopPair p = rhs.loopPair(); for( ConstLoopIter i=p.begin(); i!=p.end(); ++i ) - { - Loop * p = new Loop( *this, *i ); - vols.push_back( p ); - } + { + Loop * p = new Loop( *this, *i ); + vols.push_back( p ); } - - +} -- 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] r52684 - /trunk/storage/storage/src/include/ep-hd-lib.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 16:19:55 2008 New Revision: 52684 URL: http://svn.opensuse.org/viewcvs/yast?rev=52684&view=rev Log: - fixed syntax Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Wed Oct 29 16:19:55 2008 @@ -136,7 +136,7 @@ { // error popup Popup::Error(sformat(_("It is not possible to create a partition on %1."), - disk_device); + disk_device)); } y2milestone("ret %1", ret); -- 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] r52683 - in /trunk/storage/storage/src: include/ep-hd-dialogs.ycp include/ep-hd-lib.ycp modules/Region.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 16:18:26 2008 New Revision: 52683 URL: http://svn.opensuse.org/viewcvs/yast?rev=52683&view=rev Log: - tiny improvements Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/modules/Region.ycp Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Wed Oct 29 16:18:26 2008 @@ -126,9 +126,11 @@ `LeftRadioButtonWithAttachment(`id(`manual_region), `opt(`notify), _("Custom Region"), `VBox(`id(`manual_region_attachment), `MinWidth(10, `IntField(`id(`start_cyl), `opt(`shrinkable), - _("Start Cylinder"), 0, cyl_count, region[0]:0)), - `MinWidth(10, `IntField(`id(`num_cyls), `opt(`shrinkable), - _("Number of Cylinders"), 1, cyl_count, region[1]:0)) + _("Start Cylinder"), 0, cyl_count, + Region::Start(region))), + `MinWidth(10, `IntField(`id(`end_cyl), `opt(`shrinkable), + _("End Cylinder"), 0, cyl_count, + Region::End(region))) )) ) ) @@ -180,6 +182,7 @@ Storage::KByteToHumanString(500*1024), Storage::KByteToHumanString(1024*1024))); widget = `again; + continue; } else if (size_k < min_size_k || size_k > max_size_k) { @@ -188,16 +191,18 @@ Storage::KByteToHumanString(min_size_k), Storage::KByteToHumanString(max_size_k))); widget = `again; + continue; } break; } case `manual_region: { - region = [ (integer) UI::QueryWidget(`id(`start_cyl), `Value), - (integer) UI::QueryWidget(`id(`num_cyls), `Value) ]; + integer s = (integer) UI::QueryWidget(`id(`start_cyl), `Value); + integer e = (integer) UI::QueryWidget(`id(`end_cyl), `Value); + region = [ s, e - s + 1 ]; - boolean valid = find(list<integer> slot, slots, { + boolean valid = Region::Length(region) > 0 && find(list<integer> slot, slots, { return Region::Inside(slot, region); }) != nil; @@ -206,6 +211,7 @@ // error popup Popup::Error(_("The region entered is invalid.")); widget = `again; + continue; } break; Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Wed Oct 29 16:18:26 2008 @@ -135,8 +135,8 @@ if (size(ret) == 0) { // error popup - string text = sformat(_("It is not possible to create a partition on %1."), disk_device); - Popup::Warning(text); + Popup::Error(sformat(_("It is not possible to create a partition on %1."), + disk_device); } y2milestone("ret %1", ret); Modified: trunk/storage/storage/src/modules/Region.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Regi… ============================================================================== --- trunk/storage/storage/src/modules/Region.ycp (original) +++ trunk/storage/storage/src/modules/Region.ycp Wed Oct 29 16:18:26 2008 @@ -11,19 +11,19 @@ module "Region"; - integer Start(list<integer> a) + global integer Start(list<integer> a) { return a[0]:0; } - integer Length(list<integer> a) + global integer Length(list<integer> a) { return a[1]:0; } - integer End(list<integer> a) + global integer End(list<integer> a) { return a[0]:0 + a[1]:0 - 1; } -- 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] r52682 - /tags/stable-2_17_28/printer/
by jsmeix＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jsmeix Date: Wed Oct 29 16:07:25 2008 New Revision: 52682 URL: http://svn.opensuse.org/viewcvs/yast?rev=52682&view=rev Log: Created tag stable-2_17_28 for printer Added: tags/stable-2_17_28/printer/ - copied from r52681, trunk/printer/ -- 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] r52681 - in /trunk/printer: VERSION package/yast2-printer.changes src/Printerlib.ycp src/autoconfig.ycp
by jsmeix＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jsmeix Date: Wed Oct 29 16:07:17 2008 New Revision: 52681 URL: http://svn.opensuse.org/viewcvs/yast?rev=52681&view=rev Log: - Added functionality to remove the cups-autoconfig RPM in the Autoconfig Settings dialog. - 2.17.28 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/Printerlib.ycp trunk/printer/src/autoconfig.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=52681&r1=526… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Wed Oct 29 16:07:17 2008 @@ -1 +1 @@ -2.17.27 +2.17.28 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Wed Oct 29 16:07:17 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Oct 29 15:56:32 CET 2008 - jsmeix(a)suse.de + +- Added a AskForExistingFile popup dialog in the Add Driver + dialog to browse the file system to select a PPD file. +- Added functionality to remove the cups-autoconfig RPM + in the Autoconfig Settings dialog. +- 2.17.28 + +------------------------------------------------------------------- Fri Oct 24 12:03:52 CEST 2008 - jsmeix(a)suse.de - Fixed some bugs in the Add Driver dialog. Modified: trunk/printer/src/Printerlib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printerlib.ycp?rev=5… ============================================================================== --- trunk/printer/src/Printerlib.ycp (original) +++ trunk/printer/src/Printerlib.ycp Wed Oct 29 16:07:17 2008 @@ -92,24 +92,24 @@ // but I am only interested in real package names here. if( "installed" == action ) { if( ExecuteBashCommand( "rpm -q '" + package_name + "'" ) ) - { y2milestone( "package '%1' is installed", result["stdout"]:package_name ); + { y2milestone( "TestAndInstallPackage: package '%1' is installed", result["stdout"]:package_name ); return true; } // The "%1" makes the YCP Parser happy, otherwise it shows the warning // "Format string is not constant, no parameter checking possible". - y2milestone( "%1", result["stdout"]:"package is not installed" ); + y2milestone( "TestAndInstallPackage: %1", result["stdout"]:"TestAndInstallPackage: package is not installed" ); return false; } if( "install" == action ) { if( ExecuteBashCommand( "rpm -q '" + package_name + "'" ) ) - { y2milestone( "package '%1' is already installed", result["stdout"]:package_name ); + { y2milestone( "TestAndInstallPackage: package '%1' is already installed", result["stdout"]:package_name ); return true; } // Is the package available to be installed? // Package::Available returns nil if no package source is available. boolean package_available = Package::Available( package_name ); if( nil == package_available ) - { y2milestone( "Required package %1 is not installed and there is no package repository available.", package_name ); + { y2milestone( "TestAndInstallPackage: Required package %1 is not installed and there is no package repository available.", package_name ); Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the package name: _("Required package %1 is not installed and there is no package repository available."), package_name @@ -118,7 +118,7 @@ return false; } if( ! package_available ) - { y2milestone( "Required package %1 is not installed and not available in the repository.", package_name ); + { y2milestone( "TestAndInstallPackage: Required package %1 is not installed and not available in the repository.", package_name ); Popup::Error( sformat( // Message of a Popup::Error where %1 will be replaced by the package name: _("Required package %1 is not installed and not available in the repository."), package_name @@ -127,7 +127,7 @@ return false; } if( ! Package::Install( package_name ) ) - { y2milestone( "Failed to install required package %1.", package_name ); + { y2milestone( "TestAndInstallPackage: Failed to install required package %1.", package_name ); Popup::Error( // Message of a Popup::Error where %1 will be replaced by the package name. // Only a simple message because: // Either the user has explicitely rejected to install the package, @@ -142,11 +142,11 @@ } if( "remove" == action ) { if( ! ExecuteBashCommand( "rpm -q '" + package_name + "'" ) ) - { y2milestone( "skip remove because %1", result["stdout"]:"package is not installed" ); + { y2milestone( "TestAndInstallPackage: skip remove because %1", result["stdout"]:"package is not installed" ); return true; } if( ! Package::Remove( package_name ) ) - { y2milestone( "Failed to remove package %1.", package_name ); + { y2milestone( "TestAndInstallPackage: Failed to remove package %1.", package_name ); Popup::Error( // Message of a Popup::Error where %1 will be replaced by the package name. // Only a simple message because: // Either the user has explicitely rejected to remove the package, Modified: trunk/printer/src/autoconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/autoconfig.ycp?rev=5… ============================================================================== --- trunk/printer/src/autoconfig.ycp (original) +++ trunk/printer/src/autoconfig.ycp Wed Oct 29 16:07:17 2008 @@ -36,6 +36,7 @@ include "printer/helps.ycp"; +boolean autoconfig_settings_dialog_is_useless = false; // By default the ConfigureNewPrinters value in /etc/cups-autoconfig.conf is set to "yes": boolean initial_cups_autoconfig_ConfigureNewPrinters = true; // By default the DisablePrintersOnRemoval value in /etc/cups-autoconfig.conf is set to "no": @@ -52,47 +53,77 @@ _("Specify in which way USB printers are configured automatically") ) ), - `Left - ( `CheckBox - ( `id("cups_autoconfig_configure_new_attachend"), - // CheckBox to enable that a print queue is automatically created - // when a USB printer is connected for the first time to the USB: - _("Enable &Automatic Configuration of New Attachend USB Printers") - ) - ), - `Left - ( `CheckBox - ( `id("cups_autoconfig_disable_on_removal"), - // CheckBox to disable the print queue - // when a USB printer is disconnected from the USB: - _("&Disable Printout when Disconnecting an USB Printer") - ) - ), - `Left - ( `ComboBox - ( `id("cups_autoconfig_operation_policy"), - // Header for a ComboBox to specify the CUPS operation policy - // for print queues which are automatically created - // when a USB printer is connected for the first time to the USB: - _("Operation &Policy for Automatically Configured USB Printers"), - [""] + // Have space between the header and the choices: + `VSpacing( 1 ), + `HBox + ( `HSpacing( 3 ), + `VBox + ( `Left + ( `CheckBox + ( // Use a CheckBox to remove the cups-autoconfig RPM package + // instead of a RadioButton because this is the only RadioButton + // because there is no RadioButton to install cups-autoconfig + // because initAutoconfig checks if cups-autoconfig is installed + // and if not it tries to install it. + `id("cups_autoconfig_remove"), + // CheckBox to have no automatic configuration of USB printers at all + // by removing the cups-autoconfig RPM package. + // Do not change or translate "cups-autoconfig", it is a RPM package name. + _("No Automatic Configuration at all: &Remove the cups-autoconfig package.") + ) + ), + // Have space between the choice "No Automatic Configuration at all" + // and the settings when automatic configuration is used: + `VSpacing( 1 ), + `Left + ( `CheckBox + ( `id("cups_autoconfig_configure_new_attachend"), + // CheckBox to enable that a print queue is automatically created + // when a USB printer is connected for the first time to the USB: + _("Enable &Automatic Configuration of New Attachend USB Printers") + ) + ), + `Left + ( `CheckBox + ( `id("cups_autoconfig_disable_on_removal"), + // CheckBox to disable the print queue + // when a USB printer is disconnected from the USB: + _("&Disable Printout when Disconnecting an USB Printer") + ) + ), + `Left + ( `ComboBox + ( `id("cups_autoconfig_operation_policy"), + // Header for a ComboBox to specify the CUPS operation policy + // for print queues which are automatically created + // when a USB printer is connected for the first time to the USB: + _("Operation &Policy for Automatically Configured USB Printers"), + [""] + ) + ) ) ) ); void initAutoconfig( string key ) { y2milestone( "entering initAutoconfig with key '%1'", key ); - // The whole Autoconfig Settings dialog is useless without having cups-autoconfig installed: + // The whole Autoconfig Settings dialog is useless without having cups-autoconfig installed. + // Therefore check if cups-autoconfig is installed and if not try to install it. + // It is perfectly o.k. when the user rejects cups-autoconfig to be installed + // (perhaps he selected it to be removed before in this dialog + // and re-launched this dialog by accident or to check the current setting). + // Therefore there is no additional message shown here when the dialog is useless + // because there was a Popup request that cups-autoconfig must be installed. boolean autoconfig_settings_dialog_is_useless = false; - if( ! Printerlib::TestAndInstallPackage( "cups-autoconfig", "install" ) ) - { autoconfig_settings_dialog_is_useless = true; - Popup::Error( // Popup::Error message - // Do not change or translate "cups-autoconfig", it is a RPM package name. - _("This dialog is useless without having the package cups-autoconfig installed") - ); + if( ! Printerlib::TestAndInstallPackage( "cups-autoconfig", "installed" ) ) + { if( ! Printerlib::TestAndInstallPackage( "cups-autoconfig", "install" ) ) + { autoconfig_settings_dialog_is_useless = true; + } } + UI::ChangeWidget( `id("cups_autoconfig_remove"), `Value, autoconfig_settings_dialog_is_useless ); // Read cups-autoconfig settings. - // Ignore errors when the bash commands fail because the default values are used as fallback values. + // Ignore errors when the bash commands fail because the default values are used as + // fallback values in particular when the cups-autoconfig RPM is not installed. // By default the ConfigureNewPrinters value in /etc/cups-autoconfig.conf is set to "yes": initial_cups_autoconfig_ConfigureNewPrinters = true; Printerlib::ExecuteBashCommand( "grep -i '^ConfigureNewPrinters' /etc/cups-autoconfig.conf | cut -s -d '=' -f2 | tr -d -c '[:alnum:]'" ); @@ -148,7 +179,8 @@ { UI::ChangeWidget( `id("cups_autoconfig_operation_policy"), `Value, "not set" ); } if( autoconfig_settings_dialog_is_useless ) - { UI::ChangeWidget( `id("cups_autoconfig_label"), `Enabled, false ); + { UI::ChangeWidget( `id("cups_autoconfig_remove"), `Enabled, false ); + UI::ChangeWidget( `id("cups_autoconfig_label"), `Enabled, false ); UI::ChangeWidget( `id("cups_autoconfig_configure_new_attachend"), `Enabled, false ); UI::ChangeWidget( `id("cups_autoconfig_disable_on_removal"), `Enabled, false ); UI::ChangeWidget( `id("cups_autoconfig_operation_policy"), `Enabled, false ); @@ -159,6 +191,25 @@ void storeAutoconfig( string key, map event ) { y2milestone( "entering storeAutoconfig with key '%1'\nand event '%2'", key, event ); + // If the cups-autoconfig RPM should be removed and when it is currently installed, + // try to remove it and return because nothing else matters in this case. + // Return even when the user decided to reject the removal because + // it would lead to unexpected results when cups-autoconfig settings + // may change in the system when the user decided to remove cups-autoconfig + // but rejects the removal (i.e. some kind of "cancel/abort" by the user) + // but settings were changed in the system nevertheless. + // It is crucial to test whether cups-autoconfig is currently installed + // because it could have been not installed when the dialog was launched + // and the user may have rejected the installation in initAutoconfig + // so that the vaule of the "cups_autoconfig_remove" CheckBox would + // have been also set to 'true' in initAutoconfig. + if( (boolean)UI::QueryWidget( `id("cups_autoconfig_remove"), `Value ) ) + { if( Printerlib::TestAndInstallPackage( "cups-autoconfig", "installed" ) ) + { Printerlib::TestAndInstallPackage( "cups-autoconfig", "remove" ); + y2milestone( "leaving storeAutoconfig" ); + return nil; + } + } boolean applied_autoconfig_settings = true; // Get the actual settings and values from the dialog: boolean current_cups_autoconfig_ConfigureNewPrinters = (boolean)UI::QueryWidget( `id("cups_autoconfig_configure_new_attachend"), `Value ); -- 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] r52680 - /trunk/nfs-client/src/ui.ycp
by kmachalkova＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: kmachalkova Date: Wed Oct 29 16:05:10 2008 New Revision: 52680 URL: http://svn.opensuse.org/viewcvs/yast?rev=52680&view=rev Log: Correct enabling/disabling of edit and delete buttons depending on # of nfs shares (#438665) Modified: trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=52680&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Wed Oct 29 16:05:10 2008 @@ -431,6 +431,12 @@ specific NFSv4 Domain Name, required for correct setting of file/directory access rights.") + fw_cwm_widget["help"]:""; + void EnableDisableButtons() + { + UI::ChangeWidget(`id(`editbut), `Enabled, ( nfs_entries != [] ) ); + UI::ChangeWidget(`id(`delbut), `Enabled, ( nfs_entries != [] ) ); + } + term FstabTab() { term fstab_content = @@ -496,10 +502,7 @@ void InitFstabEntries( ) { UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems (nfs_entries)); - - integer entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem); - UI::ChangeWidget (`id(`editbut), `Enabled, entryno != nil); - UI::ChangeWidget (`id(`delbut), `Enabled, entryno != nil); + EnableDisableButtons(); // Kludge, because a `Table still does not have a shortcut. // Simple to solve here: there's only the table and buttons, @@ -545,11 +548,13 @@ map<string,any> entry = GetFstabEntry (nil, (list<map>) union (Nfs::non_nfs_entries, nfs_entries)); if (entry != nil) - { + { nfs_entries = add (nfs_entries, entry); modify_line = entry; + EnableDisableButtons(); + Nfs::SetModified(); - } + } UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems (nfs_entries)); } @@ -581,7 +586,9 @@ modify_line = share; nfs_entries = remove (nfs_entries, entryno); UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems (nfs_entries)); - Nfs::SetModified(); + EnableDisableButtons(); + + Nfs::SetModified(); } } else if (widget == `enable_nfs4) -- 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] r52679 - /trunk/storage/storage/src/include/ep-dialogs.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 15:49:51 2008 New Revision: 52679 URL: http://svn.opensuse.org/viewcvs/yast?rev=52679&view=rev Log: - more checks for crypt files Modified: trunk/storage/storage/src/include/ep-dialogs.ycp Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Wed Oct 29 15:49:51 2008 @@ -199,6 +199,7 @@ } break; } + case `crypt_fs: MiniWorkflow::SetLastStep(UI::QueryWidget(`id(`crypt_fs), `Value) != true); break; @@ -265,6 +266,14 @@ if (data["type"]:`unknown == `loop) { + if (!crypt_fs) + { + // error popup + Popup::Error(_("Crypt files must be encrypted.")); + widget = `again; + continue; + } + if (data["create_file"]:false && !do_format) { // error popup -- 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] r52678 - /tags/stable-2_17_36/packager/
by lslezak＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: lslezak Date: Wed Oct 29 15:35:00 2008 New Revision: 52678 URL: http://svn.opensuse.org/viewcvs/yast?rev=52678&view=rev Log: Created tag stable-2_17_36 for packager Added: tags/stable-2_17_36/packager/ - copied from r52677, trunk/packager/ -- 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] r52677 - in /trunk/packager: VERSION package/yast2-packager.changes src/modules/Packages.ycp
by lslezak＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: lslezak Date: Wed Oct 29 15:34:55 2008 New Revision: 52677 URL: http://svn.opensuse.org/viewcvs/yast?rev=52677&view=rev Log: - copy slideshow to the correct place (bnc#439799) - 2.17.36 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=52677&r1=52… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Oct 29 15:34:55 2008 @@ -1 +1 @@ -2.17.35 +2.17.36 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Oct 29 15:34:55 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 29 15:33:45 CET 2008 - lslezak(a)suse.cz + +- copy slideshow to the correct place (bnc#439799) +- 2.17.36 + +------------------------------------------------------------------- Mon Oct 27 14:04:11 CET 2008 - locilka(a)suse.cz - Reporting an error if software proposal cache is invalid Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Wed Oct 29 15:34:55 2008 @@ -1096,8 +1096,12 @@ WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", String::Quote (loc_slidedir))); // copy all files to our own cache - y2milestone ("Copying %1/* to %2", providedir, String::Quote (loc_slidedir)); - WFM::Execute (.local.bash, sformat ("cp -r %1/* '%2'", providedir, String::Quote (loc_slidedir))); + string copy_command = sformat("cp -r '%1/%2/txt/%3'/* '%4'", + String::Quote(providedir), String::Quote(search_for_dir), + String::Quote(used_loc_dir), String::Quote(loc_slidedir)); + + y2milestone ("Copying: %1", copy_command); + WFM::Execute (.local.bash, copy_command); // where images are stored string imagesdir = sformat ("%1/pic", search_for_dir); @@ -1109,8 +1113,11 @@ string our_imagesdir = sformat ("%1/pic/", our_slidedir); WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", String::Quote (our_imagesdir))); - y2milestone ("Copying %1/* to '%2'", imagesdir, String::Quote (our_imagesdir)); - WFM::Execute (.local.bash, sformat ("cp -r %1/* '%2'", imagesdir, String::Quote (our_imagesdir))); + copy_command = sformat("cp -r '%1/%2/pic'/* '%3'", + String::Quote(imagesdir), String::Quote(search_for_dir), String::Quote (our_imagesdir)); + + y2milestone ("Copying: %1", copy_command); + WFM::Execute (.local.bash, copy_command); } else { y2error ("No such dir: %1", imagesdir); } -- 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] r52676 - in /trunk/registration: package/yast2-registration.changes src/config/automatic_online_update.rnc src/config/online_update_configuration.desktop src/config/online_update_configuration.rnc
by jdsn＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jdsn Date: Wed Oct 29 15:32:04 2008 New Revision: 52676 URL: http://svn.opensuse.org/viewcvs/yast?rev=52676&view=rev Log: consistent naming in autoYaST profile Added: trunk/registration/src/config/online_update_configuration.rnc Removed: trunk/registration/src/config/automatic_online_update.rnc Modified: trunk/registration/package/yast2-registration.changes trunk/registration/src/config/online_update_configuration.desktop Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Wed Oct 29 15:32:04 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 29 15:31:04 CET 2008 - jdsn(a)suse.de + +- consistent naming in autoYaST profile + +------------------------------------------------------------------- Fri Oct 24 23:06:02 CEST 2008 - jdsn(a)suse.de - checking if registration runs on xen (bnc#418287) Modified: trunk/registration/src/config/online_update_configuration.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/config/online_u… ============================================================================== --- trunk/registration/src/config/online_update_configuration.desktop (original) +++ trunk/registration/src/config/online_update_configuration.desktop Wed Oct 29 15:32:04 2008 @@ -8,7 +8,7 @@ X-SuSE-YaST-AutoInst=all X-SuSE-YaST-AutoInstClonable=true X-SuSE-YaST-AutoInstRequires=lan,proxy -X-SuSE-YaST-AutoInstSchema=automatic_online_update.rnc +X-SuSE-YaST-AutoInstSchema=online_update_configuration.rnc Icon=yast-online_update Exec=/sbin/yast2 online_update_configuration Added: trunk/registration/src/config/online_update_configuration.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/config/online_u… ============================================================================== --- trunk/registration/src/config/online_update_configuration.rnc (added) +++ trunk/registration/src/config/online_update_configuration.rnc Wed Oct 29 15:32:04 2008 @@ -0,0 +1,12 @@ +default namespace = "http://www.suse.com/1.0/yast2ns" +namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" +namespace config = "http://www.suse.com/1.0/configns" + +online_update_configuration = element online_update_configuration { enable_automatic_online_update? & skip_interactive_patches? & update_interval? } + + +enable_automatic_online_update = element enable_automatic_online_update { BOOLEAN } +skip_interactive_patches = element skip_interactive_patches { BOOLEAN } +update_interval = element update_interval { text } + + -- 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] r52675 - /tags/stable-2_17_2/control-center/
by sh-sh-sh＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: sh-sh-sh Date: Wed Oct 29 15:22:04 2008 New Revision: 52675 URL: http://svn.opensuse.org/viewcvs/yast?rev=52675&view=rev Log: Created tag stable-2_17_2 for control-center Added: tags/stable-2_17_2/control-center/ - copied from r52674, trunk/control-center/ -- 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] r52674 - in /trunk/control-center: VERSION package/yast2-control-center.changes src/main.cpp
by sh-sh-sh＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: sh-sh-sh Date: Wed Oct 29 15:21:04 2008 New Revision: 52674 URL: http://svn.opensuse.org/viewcvs/yast?rev=52674&view=rev Log: Fixed bnc #438197: Need to scroll categories Modified: trunk/control-center/VERSION trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/main.cpp Modified: trunk/control-center/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION?rev=52674… ============================================================================== --- trunk/control-center/VERSION (original) +++ trunk/control-center/VERSION Wed Oct 29 15:21:04 2008 @@ -1 +1 @@ -2.17.1 +2.17.2 Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Wed Oct 29 15:21:04 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 29 15:20:18 CET 2008 - sh(a)suse.de + +- Fixed bnc #438197: Need to scroll categories +- V 2.17.2 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz - added categories Settings and System into desktop file Modified: trunk/control-center/src/main.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main.cpp?rev=… ============================================================================== --- trunk/control-center/src/main.cpp (original) +++ trunk/control-center/src/main.cpp Wed Oct 29 15:21:04 2008 @@ -96,7 +96,7 @@ y2cc.move( available.topLeft() ); } else - y2cc.resize( 680, 365 ); + y2cc.resize( 680, 420 ); app.setMainWidget( &y2cc ); -- 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] r52673 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-dialogs.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 15:12:46 2008 New Revision: 52673 URL: http://svn.opensuse.org/viewcvs/yast?rev=52673&view=rev Log: - special format and mount checks for crypt files Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-dialogs.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Oct 29 15:12:46 2008 @@ -2,6 +2,7 @@ Wed Oct 29 14:29:52 CET 2008 - aschnell(a)suse.de - fixed crypt file setup (bnc #433484) +- special format and mount checks for crypt files ------------------------------------------------------------------- Tue Oct 28 20:14:59 CET 2008 - aschnell(a)suse.de Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Wed Oct 29 15:12:46 2008 @@ -90,6 +90,9 @@ do_format = true; mount = mount_point_proposal; do_mount = mount != ""; + + if (data["type"]:`unknown == `loop) + do_mount = true; } @@ -260,6 +263,29 @@ // TODO: checks + if (data["type"]:`unknown == `loop) + { + if (data["create_file"]:false && !do_format) + { + // error popup + Popup::Error(_("You chose to create the crypt file, but did not specify +that it should be formatted. This does not make sense. + +Also check the format option. +")); + widget = `again; + continue; + } + + if (!do_mount || mount == "") + { + // error popup + Popup::Error(_("Crypt files require a mount point.")); + widget = `again; + continue; + } + } + if (do_mount) { map ret_mp = CheckOkMount(data["device"]:"error", orig_data, data); @@ -646,7 +672,7 @@ // help text string help_text = _("Choose the new size by draging the slider or by entering a numeric value in either input field."); - + UI::ChangeWidget(`help, `HelpText, help_text); -- 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] r52672 - /trunk/audit-laf/src/AuditLaf.ycp
by gs＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: gs Date: Wed Oct 29 15:11:20 2008 New Revision: 52672 URL: http://svn.opensuse.org/viewcvs/yast?rev=52672&view=rev Log: specify package "audit" correctly Modified: trunk/audit-laf/src/AuditLaf.ycp Modified: trunk/audit-laf/src/AuditLaf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/AuditLaf.ycp?rev=5… ============================================================================== --- trunk/audit-laf/src/AuditLaf.ycp (original) +++ trunk/audit-laf/src/AuditLaf.ycp Wed Oct 29 15:11:20 2008 @@ -674,7 +674,7 @@ * @return map with 2 lists. */ global map AutoPackages() { - return $[ "install":[audit], "remove":[] ]; + return $[ "install":["audit"], "remove":[] ]; } /* EOF */ -- 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] r52671 - /tags/stable-2_17_9/update/
by locilka＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: locilka Date: Wed Oct 29 14:53:21 2008 New Revision: 52671 URL: http://svn.opensuse.org/viewcvs/yast?rev=52671&view=rev Log: Created tag stable-2_17_9 for update Added: tags/stable-2_17_9/update/ - copied from r52670, trunk/update/ -- 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] r52670 - in /trunk/support: package/yast2-support.changes src/dialogs.ycp
by jsrain＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jsrain Date: Wed Oct 29 14:53:08 2008 New Revision: 52670 URL: http://svn.opensuse.org/viewcvs/yast?rev=52670&view=rev Log: issue a warning before starting browser as root Modified: trunk/support/package/yast2-support.changes trunk/support/src/dialogs.ycp Modified: trunk/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/package/yast2-support.ch… ============================================================================== --- trunk/support/package/yast2-support.changes (original) +++ trunk/support/package/yast2-support.changes Wed Oct 29 14:53:08 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 29 14:52:50 CET 2008 - jsrain(a)suse.cz + +- issue a warning before starting browser as root + +------------------------------------------------------------------- Wed Oct 29 14:07:23 CET 2008 - mzugec(a)suse.de - fixed layout Modified: trunk/support/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/support/src/dialogs.ycp?rev=5267… ============================================================================== --- trunk/support/src/dialogs.ycp (original) +++ trunk/support/src/dialogs.ycp Wed Oct 29 14:53:08 2008 @@ -118,8 +118,17 @@ if (Support::browser==nil) Popup::Error(_("Couldn't find any installed browser.")); else{ string url="http://www.novell.com/center/eservice"; - y2milestone("Executing browser %1 with URL %2", Support::browser, url); - SCR::Execute(.target.bash, sformat("su $(env|grep LOGNAME|cut -d'=' -f2-) -c \"%1 %2\"", Support::browser, url)); + if (0 == SCR::Execute (.target.bash, "env|grep LOGNAME|cut -d'=' -f2- | grep root")) + { + if (Popup::ContinueCancel (sformat (_("YaST will run a web browser as superuser. Consider +running it as a non-provileged user and entering URL +%1. +Start web browser?"), url))) + { + y2milestone("Executing browser %1 with URL %2", Support::browser, url); + SCR::Execute(.target.bash, sformat("su $(env|grep LOGNAME|cut -d'=' -f2-) -c \"%1 %2\"", Support::browser, url)); + } + } } } } -- 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] r52669 - in /trunk/update: VERSION package/yast2-update.changes src/modules/RootPart.ycp
by locilka＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: locilka Date: Wed Oct 29 14:52:57 2008 New Revision: 52669 URL: http://svn.opensuse.org/viewcvs/yast?rev=52669&view=rev Log: - Extended agent reading fstab files (bnc #438129). - 2.17.9 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/modules/RootPart.ycp Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=52669&r1=5266… ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Wed Oct 29 14:52:57 2008 @@ -1 +1 @@ -2.17.8 +2.17.9 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Wed Oct 29 14:52:57 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 29 14:47:03 CET 2008 - locilka(a)suse.cz + +- Extended agent reading fstab files (bnc #438129). +- 2.17.9 + +------------------------------------------------------------------- Tue Oct 14 17:08:25 CEST 2008 - ug(a)suse.de - partitioning_advanced in autoyast reads mount options too now Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?… ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Wed Oct 29 14:52:57 2008 @@ -685,7 +685,9 @@ `Optional(`Whitespace()), `Optional(`freq (`Number())), `Optional(`Whitespace()), - `Optional(`passno (`Number())) + `Optional(`passno (`Number())), + `Optional(`Whitespace()), + `Optional(`the_rest (`String ("^\n"))) ), "\n" )) @@ -725,7 +727,9 @@ `Separator ("\t "), `opt1 (`String("^\t ")), `Separator ("\t "), - `opt2 (`String("^ \t\n")) + `opt2 (`String("^ \t")), + `Optional(`Whitespace()), + `Optional(`the_rest (`String ("^\n"))) ), "\n" )) -- 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] r52668 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 14:49:26 2008 New Revision: 52668 URL: http://svn.opensuse.org/viewcvs/yast?rev=52668&view=rev Log: - also disable Storage::GetLoopDev Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Oct 29 14:49:26 2008 @@ -759,6 +759,7 @@ * @param integer start (start with /dev/loop$number) * @return string loop_dev ( e.g.: /dev/loop1 ) */ +/* global define string GetLoopDev( integer start ) ``{ if( Mode::test () ) @@ -791,6 +792,7 @@ return( loop_dev ); }; +*/ /** -- 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] r52667 - /trunk/printer/src/driveradd.ycp
by jsmeix＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jsmeix Date: Wed Oct 29 14:45:50 2008 New Revision: 52667 URL: http://svn.opensuse.org/viewcvs/yast?rev=52667&view=rev Log: Added a AskForExistingFile popup dialog to browse the file system to select a PPD file Modified: trunk/printer/src/driveradd.ycp Modified: trunk/printer/src/driveradd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveradd.ycp?rev=52… ============================================================================== --- trunk/printer/src/driveradd.ycp (original) +++ trunk/printer/src/driveradd.ycp Wed Oct 29 14:45:50 2008 @@ -145,10 +145,18 @@ `HBox ( `HSpacing( 3 ), `Left - ( `TextEntry - ( `id("ppd_path_input"), - // TextEntry to specify the full path of a PPD file: - _("&Printer description file name with full path where it is located") + ( `HBox + ( `TextEntry + ( `id("ppd_path_input"), + // TextEntry to specify the full path of a PPD file: + _("&Printer description file name with full path where it is located") + ), + `PushButton + ( `id("ppd_file_browser"), + // Label of a PushButton to open a file selection box + // to browse the file system to select a PPD file: + _("&Browse") + ) ) ) ), @@ -168,6 +176,18 @@ while(true) { ret = UI::UserInput(); if( ret == `abort || ret == `cancel || ret == `back ) break; + if( ret == "ppd_file_browser" ) + { string ppd_file_name = UI::AskForExistingFile( "/tmp", + "*.ppd *.ppd.gz", + // Header for a AskForExistingFile popup dialog + // to browse the file system to select a PPD file: + "Select a printer description file" + ); + if( "" != filterchars( ppd_file_name, Printer::alnum_chars ) ) + { UI::ChangeWidget( `id("ppd_path_input"), `Value, ppd_file_name ); + } + continue; + } if( ret == `next ) { // Get the actual settings and values from the dialog: boolean cups_drivers_install = (boolean)UI::QueryWidget( `id("cups-drivers"), `Value ); @@ -387,11 +407,12 @@ // and there is nothing else to be done after this: break; } - if( ! Printerlib::ExecuteBashCommand( "cupstestppd -W constraints -W defaults -W translations -r -v '" + ppd_path_input_value + "'" ) ) + if( ! Printerlib::ExecuteBashCommand( "cupstestppd -W constraints -W defaults -W translations -r '" + ppd_path_input_value + "'" ) ) { Popup::ErrorDetails( // Popup::ErrorDetails message: _("The printer description file is not in compliance to the specification."), // The cupstestppd report is on stdout: Printerlib::result["stdout"]:"" + + "\nREF is the Adobe PostScript Printer Description File Format Specification" ); if( ! Popup::ContinueCancelHeadline( // Header of a Popup::ContinueCancelHeadline // when a PPD file is not in compliance: -- 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] r52666 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 14:38:49 2008 New Revision: 52666 URL: http://svn.opensuse.org/viewcvs/yast?rev=52666&view=rev Log: - disabled function Storage::GetLoopDevice Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Oct 29 14:38:49 2008 @@ -2960,6 +2960,7 @@ return( dev ); } +/* integer loop_count = 0; global string GetLoopDevice() @@ -2979,6 +2980,7 @@ y2milestone( "GetLoopDevice dev:%1", dev ); return( dev ); } +*/ global void UpdateClassified( string key, string pwd ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0