August 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r50467 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 29 Aug '08

29 Aug '08

Author: aschnell Date: Fri Aug 29 10:38:32 2008 New Revision: 50467 URL: http://svn.opensuse.org/viewcvs/yast?rev=50467&view=rev Log: - removed evms code 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 Fri Aug 29 10:38:32 2008 @@ -4825,33 +4825,6 @@ y2milestone( "return" ); } -void UpdateBootFstabEvms() - { - string tabpath = PathToDestdir( "/etc/fstab" ); - y2milestone( "UpdateBootFstabEvms %1", - SCR::Execute( .target.bash_output, "grep /boot " + tabpath )); - map fstab = Partitions::GetFstab( tabpath ); - list lines = AsciiFile::FindLineField( fstab, 1, Partitions::BootMount() ); - y2milestone( "UpdateBootFstabEvms lines %1", lines ); - map l = AsciiFile::GetLine( fstab, lines[0]:-1 ); - if( search( l["fields",0]:"", "/dev/evms" )!=0 ) - { - map<string,map> tg = filter( string k, map e, GetTargetMap(), - ``(IsRealDisk( e )) ); - map p = GetPartition( tg, l["fields",0]:"" ); - y2milestone( "UpdateBootFstabEvms p %1", p ); - if( size(p)>0 ) - { - AsciiFile::ChangeLineField( fstab, lines[0]:-1, 0, - "/dev/evms/"+substring(p["device"]:"",5)); - AsciiFile::RewriteFile( fstab, tabpath ); - } - } - y2milestone( "UpdateBootFstabEvms %1", - SCR::Execute( .target.bash_output, "grep /boot " + tabpath )); - } - -global define boolean BootEvms(); /** * Writes fstab to the disk @@ -4880,8 +4853,6 @@ Storage::AddFstabEntry( m ); num = num+1; }); - if( BootEvms() ) - UpdateBootFstabEvms(); HandleModulesOnBoot( 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] r50466 - in /trunk/storage/storage/src: modules/Storage.ycp storage_finish.ycp
by aschnell＠svn.opensuse.org 28 Aug '08

28 Aug '08

Author: aschnell Date: Thu Aug 28 21:53:30 2008 New Revision: 50466 URL: http://svn.opensuse.org/viewcvs/yast?rev=50466&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/storage_finish.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 Thu Aug 28 21:53:30 2008 @@ -237,12 +237,9 @@ /* Storage = TargetMap /* Storage = $[ "targets" : $[], - "lvm_view_all_mnt" : true, "whole_disk" : false, "must_reread_partitions" : false, "win_device" : false, - "raidtab_created" : false, - "use_lvm" : false, "testsuite" : false, "do_resize" : "", "part_proposal_mode" : "", @@ -253,10 +250,8 @@ map StorageMap = $[]; - map<integer,map> StorageMaps = $[]; /* stringkeys for access to the Storage map */ - string lvm_view_all_mnt_key = "lvm_view_all_mnt"; string targets_key = "targets"; string targets_backup_key = "targets_backup"; string targets_backup_l_key = "targets_l_backup"; @@ -264,7 +259,6 @@ string part_mode_key = "part_mode"; string part_disk_key = "part_disk"; string whole_disk_key = "whole_disk"; - string raidtab_created_key = "raidtab_created"; string testsuite_key = "testsuite"; string do_resize_key = "do_resize"; string win_device_key = "win_device"; @@ -272,13 +266,7 @@ string part_proposal_mode_key = "part_proposal_mode"; string part_proposal_first_key = "part_proposal_first"; string part_proposal_active_key = "part_proposal_active"; - string use_lvm_key = "use_lvm"; - string storage_map_key = "storage_map"; - string storage_type_key = "storage_type"; - string storage_doc_key = "storage_doc"; - symbol record_key = `record; - symbol custom_key = `custom; boolean probe_done = false; symbol exit_key = `next; any sint = nil; @@ -408,9 +396,7 @@ global define map<string,map> GetTargetMap(); -/** -* -*/ + define list<map> GetDiskPartitionTg( string device, map<string,map> tg ) ``{ @@ -2131,22 +2117,6 @@ StorageMap = add( StorageMap, testsuite_key, value ); } - global define boolean GetLvmViewAllMnt()``{ - return StorageMap[lvm_view_all_mnt_key]:true; - } - - global define void SetLvmViewAllMnt( boolean value ) ``{ - StorageMap = add( StorageMap, lvm_view_all_mnt_key, value ); - } - - global define boolean GetRaidtabCreated()``{ - return StorageMap[raidtab_created_key]:false; - } - - global define void SetRaidtabCreated( boolean value ) ``{ - StorageMap = add( StorageMap, raidtab_created_key, value ); - } - global define string GetDoResize()``{ return StorageMap[do_resize_key]:"NO"; } @@ -2188,118 +2158,6 @@ } - - - /* StorageMaps = [ - 1: $[ storage_map_key : $[ Storage_01], - storage_type_key : `record, - ], - 2, $[ storage_map_key : $[ Storage_02], - storage_type_key : `custom, - storage_doc_key : "create partition /dev/hda2" - ], - 3: $[ storage_map_key : $[ Storage_03 ], - storage_type_key : `custom, - storage_doc_key : "delete partition /dev/hda1" - ], - 4: $[ storage_map_key : $[ Storage_04 ], - storage_type_key : `record - ] - ]; - */ - - - - /* Record - Rollback - Commit */ - /* update focus and Storage - StorageStack */ - - /* Find the next free position in the map StorageMaps - * @return integer - */ - define integer NextStorageMapsPos() ``{ - return (size( StorageMaps) + 1); - } - - - define integer FindLastRecordEntry() ``{ - map<integer,any> all_record_entries = (map<integer,any>)filter (integer key, map entry , StorageMaps, ``( entry[storage_type_key]:custom_key == record_key )); - list<integer> all_record_keys = (list<integer>) maplist(integer key, any entry , all_record_entries, ``( key )); - - if( size( all_record_entries ) > 0 ) - return sort(integer x, integer y, all_record_keys , ``(y < x))[0]:1; - else return 0; - } - - - define void Rollback2Pos(integer pos ) ``{ - StorageMap = StorageMaps[pos,storage_map_key]:$[]; - StorageMaps = filter(integer key, map entry, StorageMaps, ``( key < pos )); - } - - - define void AddEntry2StorageMaps(symbol type_key, string doc )``{ - map storage_maps_entry = $[]; - - storage_maps_entry = add(storage_maps_entry, storage_map_key , StorageMap ); - storage_maps_entry = add(storage_maps_entry, storage_type_key , type_key ); - - if( doc != "" ) - storage_maps_entry = add(storage_maps_entry, storage_type_key , doc ); - - StorageMaps = add( StorageMaps, NextStorageMapsPos(), storage_maps_entry ); - } - - - /** - * - * @return boolean - */ -/* - global define void Record()``{ - AddEntry2StorageMaps( record_key, ""); - } -*/ - - /** - * - * @return boolean - */ -/* - global define boolean Rollback()``{ - integer last_record_entry = FindLastRecordEntry(); - if( last_record_entry != 0 ) - { - Rollback2Pos( last_record_entry ); - return true; - } - else - { - return false; - } - } -*/ - - /** - * - * @return boolean - */ -/* -global define boolean Commit() - ``{ - integer last_record_entry = FindLastRecordEntry(); - if( last_record_entry != 0 ) - { - StorageMaps = filter( integer key, map entry, StorageMaps, - ``( key < last_record_entry )); - return true; - } - else - { - return false; - } - } -*/ - global define void InstallCallbacks() { StorageClients::InstallCallbacks(); @@ -4434,15 +4292,6 @@ }; - /* Functions for testing */ - - global define void DebugStorage()``{ - - y2milestone("StorageMaps: %1",StorageMaps); - y2milestone("Storage:%1",StorageMap); - } - - /** * Check if a disk is a real disk and not RAID or LVM * Modified: trunk/storage/storage/src/storage_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/storage_fini… ============================================================================== --- trunk/storage/storage/src/storage_finish.ycp (original) +++ trunk/storage/storage/src/storage_finish.ycp Thu Aug 28 21:53:30 2008 @@ -59,13 +59,6 @@ if( !Mode::update () ) { SCR::Execute (.target.mkdir, Installation::sourcedir); - - // copy /etc/raidtab to target if it was created - - if (Storage::GetRaidtabCreated()) - { - InjectFile ("/etc/raidtab"); - } Storage::FinishInstall (); } 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] r50465 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 28 Aug '08

28 Aug '08

Author: aschnell Date: Thu Aug 28 21:31:27 2008 New Revision: 50465 URL: http://svn.opensuse.org/viewcvs/yast?rev=50465&view=rev Log: - removed obsolete code 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 Thu Aug 28 21:31:27 2008 @@ -4893,66 +4893,6 @@ return( pt ); } -//----------------------------------------------------- -// -// change an entry in /etc/fstab -// -global define void ChangeLineFstab( map entry ) - ``{ - string tabpath = PathToDestdir( "/etc/fstab" ); - if( Installation::scr_destdir != "/" ) - { - if( SCR::Read( .target.size, tabpath )>= 0 ) - SCR::Execute( .target.remove, tabpath ); - } - map fstab = Partitions::GetFstab( tabpath ); - list lines = Storage::FindFstabLines( fstab, entry["mount"]:"", - entry["spec"]:"", "x", "x" ); - list fstlist = [ entry["spec"]:"", entry["mount"]:"", - entry["vfstype"]:"", entry["mntops"]:"", - sformat("%1",entry["freq"]:0), - sformat("%1",entry["passno"]:0) ]; - y2milestone( "lines %1", lines ); - if( size(lines)==0 ) - { - AsciiFile::AppendLine( fstab, fstlist ); - } - else - { - integer field = 0; - while( field<4 ) - { - AsciiFile::ChangeLineField( fstab, lines[0]:-1, field, - fstlist[field]:"" ); - field = field+1; - } - } - string dir = entry["mount"]:""; - if( substring( dir, 0, 1 )== "/" ) - { - dir = PathToDestdir( dir ); - if( SCR::Read( .target.size, dir )<=0 ) - { - SCR::Execute( .target.mkdir, dir ); - } - } - AsciiFile::RewriteFile( fstab, tabpath ); - }; - -global define map MakeCdromFstabEntry( map cd ) - ``{ - map entry = FileSystems::GetFstabDefaultMap( "cdrom" ); - string cdmount = cd["linkname"]:""; - entry["spec"] = cdmount; - entry["mount"] = "/media/"+substring(cdmount,5); - string enc = FileSystems::LangTypicalEncoding(); - if( !contains( [ "iso8859-1", "iso8859-15", "" ], enc )) - { - entry["mntops"] = entry["mntops"]:"" + ",iocharset=" + enc; - } - y2milestone( "ret %1", entry ); - return( entry ); - }; define void HandleModulesOnBoot( map<string,map> targetMap ) ``{ @@ -5164,56 +5104,6 @@ return( tg ); } -global define list<list<string> > AutodetectMultipathRaid( map<string,map> tg ) - ``{ - list<list<string> > ret = []; - map<string, list> disks = (map<string, list>) $[]; - foreach(string dev, map disk, tg, - ``{ - string id = disk["unique"]:""; - integer pos = search( id, "." ); - if( pos != nil ) - { - id = substring( id, pos+1 ); - if( haskey( disks, id ) ) - { - disks[id] = add( disks[id]:[], dev ); - } - else - { - disks[id] = [ dev ]; - } - } - }); - disks = (map<string, list>) filter(string key, list entry, disks, ``(size(entry)>=2) ); - y2milestone( "disks %1", disks ); - foreach( string key, list entry, disks, - ``{ - foreach(map p, tg[entry[0]:"","partitions"]:[], - ``{ - boolean ok = true; - list<string> dl = []; - foreach(string disk, (list<string>)entry, - ``{ - string dev = p["device"]:""; - map p1 = GetPartition( tg, dev ); - if( p1["type"]:`primary == `extended || - p1["used_by_type"]:`UB_NONE!=`UB_NONE || - size(p1["mount"]:"")>0 ) - { - ok = false; - } - dl = add( dl, dev ); - }); - if( ok ) - { - ret = add( ret, dl ); - } - }); - }); - y2milestone( "ret %1", ret ); - return( ret ); - } global define boolean PerformLosetup( map& loop, boolean format ) ``{ @@ -6671,10 +6561,7 @@ global boolean BootEvms() { - map cfg = GetControlCfg(); - boolean ret = cfg["evms_boot"]:false; - y2milestone( "BootEvms ret %1", ret ); - return( ret ); + return false; } global string ProposalVM() -- 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] r50464 - /tags/stable-2_17_6/printer/
by jsmeix＠svn.opensuse.org 28 Aug '08

28 Aug '08

Author: jsmeix Date: Thu Aug 28 18:34:23 2008 New Revision: 50464 URL: http://svn.opensuse.org/viewcvs/yast?rev=50464&view=rev Log: Created tag stable-2_17_6 for printer Added: tags/stable-2_17_6/printer/ - copied from r50463, 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] r50463 - in /trunk/printer: VERSION package/yast2-printer.changes src/Printerlib.ycp src/dialogs.ycp src/printingvianetwork.ycp tools/cups_client_only tools/modify_cupsd_conf yast2-printer.spec.in
by jsmeix＠svn.opensuse.org 28 Aug '08

28 Aug '08

Author: jsmeix Date: Thu Aug 28 18:34:10 2008 New Revision: 50463 URL: http://svn.opensuse.org/viewcvs/yast?rev=50463&view=rev Log: - Fixed build (new scripts were not packaged). - The 'Printing via Network' dialog UI should now work correctly but writing the values to the system is not yet implemented. - 2.17.6 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/Printerlib.ycp trunk/printer/src/dialogs.ycp trunk/printer/src/printingvianetwork.ycp trunk/printer/tools/cups_client_only trunk/printer/tools/modify_cupsd_conf trunk/printer/yast2-printer.spec.in Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=50463&r1=504… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Thu Aug 28 18:34:10 2008 @@ -1 +1 @@ -2.17.5 +2.17.6 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 Thu Aug 28 18:34:10 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Aug 28 18:19:32 CEST 2008 - jsmeix(a)suse.de + +- Fixed build (new scripts were not packaged). +- The 'Printing via Network' dialog UI should now work correctly + but writing the values to the system is not yet implemented. +- 2.17.6 + +------------------------------------------------------------------- Wed Aug 27 16:22:28 CEST 2008 - jsmeix(a)suse.de - Enhanced scripts in the tools directory to make them 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 Thu Aug 28 18:34:10 2008 @@ -1,7 +1,16 @@ + { + module "Printerlib"; textdomain "printer"; +// Fortunately the tools are for all architectures always +// installed in /usr/lib/YaST2/bin/ (i.e. no "lib64"). +// I tested this on Thu Aug 28 2008 using the command +// rpm -qlp /work/CDs/all/full-sle10-sp2*/suse/*/yast2-printer.rpm | grep '/YaST2/bin/' | grep -v '/usr/lib/YaST2/bin/' +global string yast_bin_dir = "/usr/lib/YaST2/bin/"; + +// By default there is no active "ServerName" entry in /etc/cups/client.conf: global boolean client_only = false; global string client_conf_server_name = ""; @@ -12,9 +21,10 @@ // is explicitely set in /etc/cups/cupsd.conf. global boolean browsing_on = true; -// By default there is no "BrowseDeny" entry in /etc/cups/cupsd.conf -// but there can be such entries of the form "BrowseDeny .*" or "BrowseDeny from .*": -global string cupsd_conf_browse_deny = ""; +// By default there is "BrowseAllow all" in /etc/cups/cupsd.conf +// which is even the fallback if there is no "BrowseAllow" entry at all +// or when the "BrowseAllow" entries are deactivated by a leading '#' character. +global string cupsd_conf_browse_allow = "all"; // The result map is used as a simple common local store for whatever additional results // (in particular commandline exit code, stdout, stderr, and whatever messages) @@ -51,22 +61,47 @@ global map<string, any> cups_autoconfig = $[]; -global void Read(){ - client_only = ExecuteBashCommand( "egrep -i '^ServerName[[:space:]]+[[:alnum:]]' /etc/cups/client.conf" ); - if( ExecuteBashCommand( "sed -n -e 's/^[Se][Ee][Rr][Vv][Ee][Rr][Nn][Aa][Mm][Ee][[:space:]][[:space:]]*\$.*\$$/\\1/p' /etc/cups/client.conf | tr -d '[:space:]'" ) ) - client_conf_server_name = result["stdout"]:""; - - if( Printerlib::ExecuteBashCommand( "egrep -i '^Browsing[[:space:]]+Off|^Browsing[[:space:]]+No' /etc/cups/cupsd.conf" ) ) - browsing_on = false; - string commandline = "egrep -i '^BrowseDeny[[:space:]]+|^BrowseDeny[[:space:]]+from[[:space:]]+' /etc/cups/cupsd.conf | sed -e 's/[Ff][Rr][Oo][Mm]//' | tr -s '[:space:]' | cut -d ' ' -f 2 | tr '[:space:]' ' '"; - if( Printerlib::ExecuteBashCommand( commandline ) ) cupsd_conf_browse_deny = Printerlib::result["stdout"]:""; - // read cups-autoconfiguration settings - cups_autoconfig = (map<string, any>)SCR::Read(.etc.cups-auto.all); -y2internal("read cups-auto %1", cups_autoconfig); +global void Read() +{ // Determine the 'Browsing [ On | Off ]' value in /etc/cups/cupsd.conf: + if( Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf Browsing" ) ) + { // Ignore when this command fails and use the fallback "Printerlib::browsing_on = true" + string browsing = tolower( Printerlib::result["stdout"]:"On" ); + if( "off" == browsing || "no" == browsing ) + { Printerlib::browsing_on = false; + } + } + // Determine the 'BrowseAllow [ all | none | @LOCAL | IP-address[/netmask] ]' values in /etc/cups/cupsd.conf: + if( Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf BrowseAllow" ) ) + { // Ignore when this command fails and use the fallback "Printerlib::cupsd_conf_browse_allow = "all" + Printerlib::cupsd_conf_browse_allow = Printerlib::result["stdout"]:"all"; + } + // Determine the 'ServerName' value in /etc/cups/client.conf: + if( Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "cups_client_only" ) ) + { // Ignore when this command fails and use the fallback "Printerlib::client_only = false" + // and the fallback "Printerlib::client_conf_server_name = "" + Printerlib::client_conf_server_name = Printerlib::result["stdout"]:""; + if( "" != Printerlib::client_conf_server_name + && "localhost" != Printerlib::client_conf_server_name ) + { // Note that even 'localhost' is a valid ServerName value + // which is used to force client tools (e.g. lpadmin, lpinfo, lpstat) + // to ask the local cupsd via the IPP port on localhost (localhost:631) + // and not via the domain socket (/var/run/cups/cups.sock) because + // the latter failed in the past for certain third-party clients (e.g. Java). + // If the ServerName value in /etc/cups/client.conf is 'localhost' + // it is actually no client-only config because the local cupsd is used. + Printerlib::client_only = true; + } + } + // Read cups-autoconfiguration settings: + cups_autoconfig = (map<string, any>)SCR::Read(.etc.cups-auto.all); + y2internal("read cups-auto %1", cups_autoconfig); } -global void Write(){ - y2milestone("Writing cups-autoconfig.conf\n%1", cups_autoconfig); - SCR::Write(.etc.cups-auto.all, cups_autoconfig); +global void Write() +{ // Write cups-autoconfiguration settings: + y2milestone("Writing cups-autoconfig.conf\n%1", cups_autoconfig); + SCR::Write(.etc.cups-auto.all, cups_autoconfig); } + } + Modified: trunk/printer/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/dialogs.ycp?rev=5046… ============================================================================== --- trunk/printer/src/dialogs.ycp (original) +++ trunk/printer/src/dialogs.ycp Thu Aug 28 18:34:10 2008 @@ -262,8 +262,10 @@ "NETWORKPRINTING" : $[ "widget" : `custom, "custom_widget" : widgetNetworkPrinting, + "init" : initNetworkPrinting, "handle" : handleNetworkPrinting, - "help" : HELPS["printing_via_network_dialog"]:"" + "store" : storeNetworkPrinting, + "help" : HELPS["printing_via_network_dialog"]:"" ], "SHARING" : $[ "widget" : `custom, Modified: trunk/printer/src/printingvianetwork.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printingvianetwork.y… ============================================================================== --- trunk/printer/src/printingvianetwork.ycp (original) +++ trunk/printer/src/printingvianetwork.ycp Thu Aug 28 18:34:10 2008 @@ -47,34 +47,29 @@ `RadioButtonGroup( `id(`browsing_or_client_only_check_boxs), `VBox( `Left( `RadioButton( `id(`cupsd_conf_browsing_off_radio_button), `opt(`notify), - _("&Do not Receive Printer Information from Remote CUPS servers"), - ! Printerlib::client_only && ! Printerlib::browsing_on + _("&Do not Receive Printer Information from Remote CUPS servers") ) ), `Left( `RadioButton( `id(`cupsd_conf_browsing_on_radio_button), `opt(`notify), - _("&Receive Printer Information from Remote CUPS servers"), - ! Printerlib::client_only && Printerlib::browsing_on + _("Receive Printer &Information from Remote CUPS servers") ) ), `HBox( `HSpacing( 3 ), - `TextEntry( `id(`cupsd_conf_browse_deny_input), - _("&Show Printers Published by CUPS Servers Except the Following (separated by spaces)"), - Printerlib::cupsd_conf_browse_deny + `TextEntry( `id(`cupsd_conf_browse_allow_input), + _("Accept Information from those &Servers (separated by a space)") ) ), `VSpacing( 1 ), - `Left( `RadioButton( `id(`client_only_check_box), + `Left( `RadioButton( `id(`client_only_radio_button), `opt(`notify), - _("Do All Your Printing Directly via One Remote &CUPS Server"), - Printerlib::client_only + _("Do All Your Printing Directly via &One Remote CUPS Server") ) ), `HBox( `HSpacing( 3 ), `HWeight( 2, `TextEntry( `id(`client_conf_server_name_input), - _("&Hostname / IP Address"), - Printerlib::client_conf_server_name + _("&Hostname / IP Address") ) ), `HWeight( 1, @@ -97,57 +92,113 @@ `VStretch() ); - -symbol handleNetworkPrinting(string key, map event){ - if( Printerlib::browsing_on ) - { UI::ChangeWidget( `id(`cupsd_conf_browse_deny_input), `Enabled, true ); - UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, false ); - UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, false ); - UI::ChangeWidget( `id(`connection_wizard), `Enabled, true ); +void initNetworkPrinting(string key) +{ y2milestone( "entering initNetworkPrinting with key '%1'", key ); + // Determine the 'Browsing [ On | Off ]' value in /etc/cups/cupsd.conf: + if( Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf Browsing" ) ) + { // Ignore when this command fails and use initially the fallback "Printerlib::browsing_on = true" + string browsing = tolower( Printerlib::result["stdout"]:"On" ); + if( "off" == browsing || "no" == browsing ) + { Printerlib::browsing_on = false; + } + else + { Printerlib::browsing_on = true; + } } - else - { UI::ChangeWidget( `id(`cupsd_conf_browse_deny_input), `Enabled, false ); - UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, false ); - UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, false ); - UI::ChangeWidget( `id(`connection_wizard), `Enabled, true ); + // Determine the 'BrowseAllow [ all | none | @LOCAL | IP-address[/netmask] ]' values in /etc/cups/cupsd.conf: + if( Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf BrowseAllow" ) ) + { // Ignore when this command fails and use initially the fallback "Printerlib::cupsd_conf_browse_allow = "all" + Printerlib::cupsd_conf_browse_allow = Printerlib::result["stdout"]:"all"; + } + // Determine the 'ServerName' value in /etc/cups/client.conf: + if( Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "cups_client_only" ) ) + { // Ignore when this command fails and use initially the fallback "Printerlib::client_only = false" + // and the initiall fallback "Printerlib::client_conf_server_name = "" + Printerlib::client_conf_server_name = Printerlib::result["stdout"]:""; + if( "" != Printerlib::client_conf_server_name + && "localhost" != Printerlib::client_conf_server_name ) + { // Note that even 'localhost' is a valid ServerName value + // which is used to force client tools (e.g. lpadmin, lpinfo, lpstat) + // to ask the local cupsd via the IPP port on localhost (localhost:631) + // and not via the domain socket (/var/run/cups/cups.sock) because + // the latter failed in the past for certain third-party clients (e.g. Java). + // If the ServerName value in /etc/cups/client.conf is 'localhost' + // it is actually no client-only config because the local cupsd is used. + Printerlib::client_only = true; + } + else + { Printerlib::client_only = false; + } } + // Have all widgets disabled initially + // but nevertheless fill in the values of the current settings in the system: + UI::ChangeWidget( `id(`cupsd_conf_browsing_off_radio_button), `Value, false ); + UI::ChangeWidget( `id(`cupsd_conf_browsing_on_radio_button), `Value, false ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_input), `Enabled, false ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_input), `Value, Printerlib::cupsd_conf_browse_allow ); + UI::ChangeWidget( `id(`client_only_radio_button), `Value, false ); + UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, false ); + UI::ChangeWidget( `id(`client_conf_server_name_input), `Value, Printerlib::client_conf_server_name ); + UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, false ); + UI::ChangeWidget( `id(`connection_wizard), `Enabled, false ); + // Enable those widgets which match to the current settings in the system: + // If there is 'Browsing On' in /etc/cups/cupsd.conf + // but there is also an active ServerName (!="localhost") in /etc/cups/client.conf + // have only the client-only widgets avtivated because client-only has topmost priority: if( Printerlib::client_only ) - { UI::ChangeWidget( `id(`cupsd_conf_browse_deny_input), `Enabled, false ); + { UI::ChangeWidget( `id(`client_only_radio_button), `Value, true ); UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, true ); UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, true ); - UI::ChangeWidget( `id(`connection_wizard), `Enabled, false ); } + else + { UI::ChangeWidget( `id(`connection_wizard), `Enabled, true ); + if( Printerlib::browsing_on ) + { UI::ChangeWidget( `id(`cupsd_conf_browsing_on_radio_button), `Value, true ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_input), `Enabled, true ); + } + else + { UI::ChangeWidget( `id(`cupsd_conf_browsing_off_radio_button), `Value, true ); + } + } + y2milestone( "leaving initNetworkPrinting" ); +} - if ( event["EventReason"]:"" == "ValueChanged" ){ - if( event["ID"]:nil == `cupsd_conf_browsing_on_radio_button ) - { UI::ChangeWidget( `id(`cupsd_conf_browse_deny_input), `Enabled, true ); +symbol handleNetworkPrinting(string key, map event) +{ y2milestone( "entering handleNetworkPrinting with key '%1'\nand event '%2'", key, event ); + if( "ValueChanged" == event["EventReason"]:"" ) + { if( `cupsd_conf_browsing_on_radio_button == event["ID"]:nil ) + { UI::ChangeWidget( `id(`cupsd_conf_browse_allow_input), `Enabled, true ); UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, false ); UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, false ); UI::ChangeWidget( `id(`connection_wizard), `Enabled, true ); } - if( event["ID"]:nil == `cupsd_conf_browsing_off_radio_button ) - { UI::ChangeWidget( `id(`cupsd_conf_browse_deny_input), `Enabled, false ); + if( `cupsd_conf_browsing_off_radio_button == event["ID"]:nil ) + { UI::ChangeWidget( `id(`cupsd_conf_browse_allow_input), `Enabled, false ); UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, false ); UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, false ); UI::ChangeWidget( `id(`connection_wizard), `Enabled, true ); } - if( event["ID"]:nil == `client_only_check_box) - { UI::ChangeWidget( `id(`cupsd_conf_browse_deny_input), `Enabled, false ); + if( `client_only_radio_button == event["ID"]:nil ) + { UI::ChangeWidget( `id(`cupsd_conf_browse_allow_input), `Enabled, false ); UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, true ); UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, true ); UI::ChangeWidget( `id(`connection_wizard), `Enabled, false ); } } - - if (event["EventReason"]:""=="Activated" && event["ID"]:nil==`connection_wizard) return `connection_wizard; - - y2internal("event %1", event); - return nil; + if( "Activated" == event["EventReason"]:"" ) + { if( `connection_wizard == event["ID"]:nil ) + { return `connection_wizard; + } + } + y2internal("event %1", event); + y2milestone( "leaving handleNetworkPrinting" ); + return nil; } - - - +void storeNetworkPrinting(string key, map event) +{ y2milestone( "entering storeNetworkPrinting with key '%1'\nand event '%2'", key, event ); + y2milestone( "leaving storeNetworkPrinting" ); +} /** Modified: trunk/printer/tools/cups_client_only URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/cups_client_only?r… ============================================================================== --- trunk/printer/tools/cups_client_only (original) +++ trunk/printer/tools/cups_client_only Thu Aug 28 18:34:10 2008 @@ -45,7 +45,7 @@ # the output is the empty string (i.e. nothing at all - not even a '\n' character). # The 'tr ... [:blank:]' makes sure that all active ServerName entries # are found if there is more than one which is a broken config. -SERVERNAME="$( grep -i '^ServerName ' /etc/cups/client.conf | tr -s '[:blank:]' ' ' | cut -s -d' ' -f2 )" +SERVERNAME="$( grep -i '^ServerName ' /etc/cups/client.conf | tr -s '[:blank:]' ' ' | cut -s -d' ' -f2 | tr -s '\n' ' ' | sed -e 's/ *$//' )" echo -n "$SERVERNAME" # For a nicer output on a terminal where stdout and stderr is mixed up, # output a '\n' on stderr to get subsequent stuff (e.g. the shell prompt Modified: trunk/printer/tools/modify_cupsd_conf URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/modify_cupsd_conf?… ============================================================================== --- trunk/printer/tools/modify_cupsd_conf (original) +++ trunk/printer/tools/modify_cupsd_conf Thu Aug 28 18:34:10 2008 @@ -17,7 +17,12 @@ echo "Without a new value, the current value is reported." 1>&2 echo "Supported keywords and possible new values are:" 1>&2 echo "Browsing [ On | Off ]" 1>&2 - echo "BrowseAllow [ all | none | @LOCAL | IP-address ]" 1>&2 + echo "BrowseAllow [ all | none | @LOCAL | IP-address[/netmask] ]" 1>&2 + echo "E.g.: BrowseAllow '@LOCAL 192.168.100.1 192.168.200.0/255.255.255.0'" 1>&2 + echo "There is a strict syntax for keywords and values:" 1>&2 + echo "Case matters." 1>&2 + echo "Neither leading nor trailing nor in-between spaces are allowed." 1>&2 + echo "Multiple values for a keyword must be separated by exactly one space." 1>&2 exit 1 fi @@ -34,7 +39,7 @@ { if test -n "$VALUE" then # If a value was specified, only 'On' or 'Off' (case sensitive) are allowed: if ! test "On" = "$VALUE" -o "Off" = "$VALUE" - then echo "Only '$KEY [ On | Off ]' is allowed." 1>&2 + then echo "Only '$KEY [ On | Off ]' is supported." 1>&2 exit 4 fi # Try to substitute an existing Browsing line (ignore case): @@ -54,7 +59,8 @@ # Report the resulting setting in any case: # The 'tr ... [:blank:]' makes sure that all active Browsing entries # are found if there is more than one which is a broken config. - RESULT="$( grep -i "^$KEY " $CUPSDCONF | tr -s '[:blank:]' ' ' | cut -s -d' ' -f2 )" + # Remove trailing spaces (needed for the test below). + RESULT="$( grep -i "^$KEY " $CUPSDCONF | tr -s '[:blank:]' ' ' | cut -s -d' ' -f2 | tr -s '\n' ' ' | sed -e 's/ *$//' )" echo -n "$RESULT" # For a nicer output on a terminal where stdout and stderr is mixed up, # output a '\n' on stderr to get subsequent stuff (e.g. the shell prompt @@ -67,20 +73,23 @@ fi } -# Function to deal with 'BrowseAllow [ all | none | @LOCAL | IP-address ]' +# Function to deal with 'BrowseAllow [ all | none | @LOCAL | IP-address[/netmask] ]' BrowseAllow() { if test -n "$VALUE" then # If a value was specified, only 'all' or 'none' or '@LOCAL' (case sensitive) - # or a single IP-address is allowed: - if ! test "all" = "$VALUE" -o "none" = "$VALUE" -o "@LOCAL" = "$VALUE" - then # Test if value matches to IP-address syntax: - if ! echo $VALUE | egrep -q '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$' - then echo "Only '$KEY [ all | none | @LOCAL | IP-address ]' is allowed." 1>&2 - exit 4 - fi - fi + # or one or more IP-addresses are allowed: + for V in $VALUE + do if ! test "all" = "$V" -o "none" = "$V" -o "@LOCAL" = "$V" + then # Test if value matches to IP-address syntax: + if ! echo "$V" | egrep -q '^([0-9]{1,3}\.){3}[0-9]{1,3}(/([0-9]{1,2})|/(([0-9]{1,3}\.){3}[0-9]{1,3}))?$' + then echo "Only '$KEY [ all | none | @LOCAL | IP-address[/netmask] ]' is supported." 1>&2 + exit 4 + fi + fi + done # Set 'BrowseOrder allow,deny' to deny browse packets by default - # and then allow them from certain sources via a BrowseAllow entry. + # and then allow them from certain sources via BrowseAllow entries + # and finally deny from certain sources via BrowseDeny entries. # All existing BrowseOrder lines are removed (ignore case). sed -i.yast2save -e '/^BrowseOrder.*/Id' $CUPSDCONF # Append the new BrowseOrder line below the last 'Brows' line (ignore case) @@ -91,16 +100,22 @@ then sed -i -e "${LAST_BROWSE_LINE}aBrowseOrder allow,deny" $CUPSDCONF else echo -en "\nBrowseOrder allow,deny\n\n" >>$CUPSDCONF fi - # All existing BrowseAllow lines are removed (ignore case): + # All existing active BrowseAllow lines are removed (ignore case): sed -i -e '/^BrowseAllow.*/Id' $CUPSDCONF - # Append a BrowseAllow line below the BrowseOrder line - # to have the new BrowseAllow line at the matching place: - sed -i -e "/^BrowseOrder /a$KEY from $VALUE" $CUPSDCONF + # All existing active BrowseDeny lines are deactivated (ignore case): + sed -i -e 's/^$BrowseDeny.*$$/#\1/i' $CUPSDCONF + # Insert BrowseAllow lines before the BrowseOrder line + # to have the new BrowseAllow lines at the matching place + # and in the ordering of the values (needed for the test below): + for V in $VALUE + do sed -i -e "/^BrowseOrder /i$KEY from $V" $CUPSDCONF + done fi # Report the resulting setting in any case: # The 'tr ... [:blank:]' makes sure that all active BrowseAllow entries # are found if there is more than one which is allowed. - RESULT="$( grep -i "^$KEY " $CUPSDCONF | tr -s '[:blank:]' ' ' | cut -s -d' ' -f3 )" + # Remove trailing spaces (needed for the test below). + RESULT="$( grep -i "^$KEY " $CUPSDCONF | sed -e 's/from//I' | tr -s '[:blank:]' ' ' | cut -s -d' ' -f2 | tr -s '\n' ' ' | sed -e 's/ *$//' )" echo -n "$RESULT" # For a nicer output on a terminal where stdout and stderr is mixed up, # output a '\n' on stderr to get subsequent stuff (e.g. the shell prompt Modified: trunk/printer/yast2-printer.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/yast2-printer.spec.in?re… ============================================================================== --- trunk/printer/yast2-printer.spec.in (original) +++ trunk/printer/yast2-printer.spec.in Thu Aug 28 18:34:10 2008 @@ -56,6 +56,8 @@ @ybindir@/autodetect_printers @ybindir@/create_printer_ppd_database @ybindir@/determine_printer_driver_options +@ybindir@/cups_client_only +@ybindir@/modify_cupsd_conf #Documentation %dir @docdir@ -- 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] r50462 - in /trunk/storage/storage/src/include: ep-hd.ycp ep-lvm.ycp ep-raid.ycp
by aschnell＠svn.opensuse.org 28 Aug '08

28 Aug '08

Author: aschnell Date: Thu Aug 28 16:29:09 2008 New Revision: 50462 URL: http://svn.opensuse.org/viewcvs/yast?rev=50462&view=rev Log: - some help texts Modified: trunk/storage/storage/src/include/ep-hd.ycp trunk/storage/storage/src/include/ep-lvm.ycp trunk/storage/storage/src/include/ep-raid.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Thu Aug 28 16:29:09 2008 @@ -98,7 +98,9 @@ ) ); - string helptext = _("HD TODO"); + // helptext + string helptext = _("This view shows all hard disks including +iSCSI disks, BIOS RAIDs and Multipath disks and their partitions."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } Modified: trunk/storage/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm.ycp Thu Aug 28 16:29:09 2008 @@ -42,7 +42,9 @@ ) ); - string helptext = _("LVM TODO"); + // helptext + string helptext = _("This view shows all LVM volume groups and +their logical volumes."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } Modified: trunk/storage/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid.ycp (original) +++ trunk/storage/storage/src/include/ep-raid.ycp Thu Aug 28 16:29:09 2008 @@ -42,7 +42,8 @@ ) ); - string helptext = _("RAID TODO"); + // helptext + string helptext = _("This view shows all RAIDs except of BIOS RAIDs."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } -- 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] r50461 - /trunk/devtools/devtools/data/YaST2.dict.txt
by locilka＠svn.opensuse.org 28 Aug '08

28 Aug '08

Author: locilka Date: Thu Aug 28 16:14:10 2008 New Revision: 50461 URL: http://svn.opensuse.org/viewcvs/yast?rev=50461&view=rev Log: Adding some missing words Modified: trunk/devtools/devtools/data/YaST2.dict.txt Modified: trunk/devtools/devtools/data/YaST2.dict.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/data/YaST2.dic… ============================================================================== --- trunk/devtools/devtools/data/YaST2.dict.txt (original) +++ trunk/devtools/devtools/data/YaST2.dict.txt Thu Aug 28 16:14:10 2008 @@ -3,16 +3,21 @@ AutoYaST BIOS BOOTP +Bacula +Belarus Bluetooth CDs CGI CNAME +CardBus +DASD DDNS DHCP DN DNS DSL DTD +DVB DVD DVDs FireWire @@ -20,6 +25,7 @@ GDM GNOME GPG +Georgia GnuPG HTTPS IMAP @@ -28,8 +34,11 @@ IPP IPs IPsec +IPv4 +IPv6 IRQ ISA +ISDN ISP IrDA JFS @@ -37,10 +46,12 @@ KDM KInternet Kb +Kerberos Konqueror LDAP LDAPS LVM +Linuxrc MBR MSN MTU @@ -52,6 +63,7 @@ NIS NS NetBIOS +NetworkManager Novell OpenGL OpenLDAP @@ -60,6 +72,7 @@ PPC PTR Perl +RTC ReiserFS SASL SHA @@ -72,18 +85,24 @@ SSL SUSE SaX +SuSE SuSEconfig SuSEfirewall TLS TSIG TSL +Tajikistan UDP +UML URI USB UTC Uninstall Uninstalled +Uzbekistan VESA +VLAN +VMWare VNC WAP WEP @@ -93,6 +112,7 @@ XFree YaST ZENworks +ZFCP ZMD autodetect autodetected @@ -107,16 +127,21 @@ ethernet fetchmail firewalled +framebuffer fstab hotplug hotpluggable hotplugging +iSCSI init initrd +lighttpd loopback masqueraded multiboot +ncurses netmask +openSUSE passphrase passwd postinstallation @@ -125,16 +150,20 @@ preinstallation preshared procmail +pureftpd reinstall reinstallation runlevel runlevels +smb +strace subarchive subarchives subdomain subdomains sysconfig syslog +umount uncheck unchecked unconfigured @@ -145,11 +174,5 @@ unmounting workflow xntp -UML -iSCSI -DASD -ZFCP -openSUSE -smb -umount -strace +yast2 +ypbind -- 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] r50460 - in /trunk/storage/storage/src: include/custom_part_lib.ycp include/ep-hd-dialogs.ycp include/ep-lvm-dialogs.ycp inst_disk_proposal.ycp
by aschnell＠svn.opensuse.org 28 Aug '08

28 Aug '08

Author: aschnell Date: Thu Aug 28 16:07:16 2008 New Revision: 50460 URL: http://svn.opensuse.org/viewcvs/yast?rev=50460&view=rev Log: - fixed typos Modified: trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/include/ep-hd-dialogs.ycp trunk/storage/storage/src/include/ep-lvm-dialogs.ycp trunk/storage/storage/src/inst_disk_proposal.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 Thu Aug 28 16:07:16 2008 @@ -412,7 +412,7 @@ { allowed = false; // error popup text - Popup::Error(_("Invalid character in mount point. Dont use \"`'!\"%#\" in a mount point.")); + Popup::Error(_("Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point.")); } // check if the mount point is a system mount point 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 Thu Aug 28 16:07:16 2008 @@ -139,7 +139,7 @@ } else if (size_k < min_size_k || size_k > max_size_k) { - Popup::Error(sformat(_("The size entered is invalid. Enter a size beteen %1 and %2."), + Popup::Error(sformat(_("The size entered is invalid. Enter a size between %1 and %2."), Storage::KByteToHumanString(min_size_k), Storage::KByteToHumanString(max_size_k))); widget = `again; Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Thu Aug 28 16:07:16 2008 @@ -389,7 +389,7 @@ } else if (size_k < min_size_k || size_k > max_size_k) { - Popup::Error(sformat(_("The size entered is invalid. Enter a size beteen %1 and %2."), + Popup::Error(sformat(_("The size entered is invalid. Enter a size between %1 and %2."), Storage::KByteToHumanString(min_size_k), Storage::KByteToHumanString(max_size_k))); widget = `again; Modified: trunk/storage/storage/src/inst_disk_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_disk_pr… ============================================================================== --- trunk/storage/storage/src/inst_disk_proposal.ycp (original) +++ trunk/storage/storage/src/inst_disk_proposal.ycp Thu Aug 28 16:07:16 2008 @@ -241,7 +241,7 @@ To make only small adjustments to the proposed setup (like e.g. changing filesystem types), choose %1 and do these modification in the expert -partioner dialog. +partitioner dialog. "), deletechars(modify_str,"&")); // help text continued -- 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] r50459 - in /branches/tmp/visnov/progress: packager/SlideShow.ycp storage/StorageClients.ycp
by visnov＠svn.opensuse.org 28 Aug '08

28 Aug '08

Author: visnov Date: Thu Aug 28 15:52:39 2008 New Revision: 50459 URL: http://svn.opensuse.org/viewcvs/yast?rev=50459&view=rev Log: - make it work on running system - storage progress needs more work Modified: branches/tmp/visnov/progress/packager/SlideShow.ycp branches/tmp/visnov/progress/storage/StorageClients.ycp Modified: branches/tmp/visnov/progress/packager/SlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/visnov/progress/packager/… ============================================================================== --- branches/tmp/visnov/progress/packager/SlideShow.ycp (original) +++ branches/tmp/visnov/progress/packager/SlideShow.ycp Thu Aug 28 15:52:39 2008 @@ -74,7 +74,12 @@ boolean user_abort = false; + // we need to remember the values for tab switching string total_progress_label = _("Installing..."); + string sub_progress_label = _("Installing..."); + integer total_progress_value = 0; + integer sub_progress_value =0; + boolean _show_table = false; // properties of the current UI @@ -169,6 +174,8 @@ UI::ChangeWidget(`progressCurrentPackage, `Value, 0); UI::ChangeWidget(`progressCurrentPackage, `Label, text); } + + sub_progress_label = text; } // update the subprogress widget @@ -180,6 +187,10 @@ if( text != nil ) UI::ChangeWidget(`progressCurrentPackage, `Label, text ); } + + sub_progress_value = value; + if (text != nil) + sub_progress_label = text; } // start a new global progress @@ -191,6 +202,9 @@ UI::ChangeWidget(`progressTotal, `Value, 0); UI::ChangeWidget(`progressTotal, `Label, text ); } + + total_progress_label = text; + total_progress_value = 0; } // update the global progress widget @@ -198,10 +212,10 @@ { if( new_text != nil) total_progress_label = new_text; + total_progress_value = value; if ( UI::WidgetExists(`progressTotal ) ) { - y2milestone( "Changing progressTotal to %1", value ); UI::ChangeWidget(`progressTotal, `Value, value); if( new_text != nil ) UI::ChangeWidget(`progressTotal, `Label, new_text ); @@ -236,7 +250,6 @@ global void StageProgress( integer value, string text ) { - y2milestone( "Stage progress: %1\nValue: %2", _current_stage, value ); UpdateGlobalProgress( _current_stage["start"]:0 + (value * _current_stage["size"]:1 / 100), text ); } @@ -1456,8 +1469,6 @@ **/ term AddProgressWidgets( symbol page_id, term page_contents ) { - y2milestone("Adding progress widgets"); - term widgets = `HBox(`id( page_id ), `HSpacing( 1 ), @@ -1465,7 +1476,7 @@ `VWeight( 1, // lower layout priority page_contents ), // Progress bar for overall progress of software package installation - `ProgressBar(`id(`progressTotal ), GetProgressLabel(), 100, 0) + `ProgressBar(`id(`progressTotal ), GetProgressLabel(), 100, total_progress_value) // intentionally omitting `Label(`nextMedia) - // too much flicker upon update (UI::RecalcLayout() ) on NCurses ), @@ -1527,7 +1538,7 @@ `VWeight( 1, `LogView(`id(`instLog ), _("Actions performed:"), 6, 0 ) ), - `ProgressBar(`id(`progressCurrentPackage), " ", 100, 0 ) + `ProgressBar(`id(`progressCurrentPackage), sub_progress_label, 100, sub_progress_value ) ) ); @@ -1556,7 +1567,7 @@ { UI::ChangeWidget(`dumbTab, `CurrentItem, `showSlide ); UI::ReplaceWidget(`tabContents, SlidePageWidgets() ); - UpdateTotalProgress(false); // FIXME: this breaks other stages! + // UpdateTotalProgress(false); // FIXME: this breaks other stages! } } @@ -1570,8 +1581,8 @@ y2milestone( "Contents set to details" ); } - UpdateTotalProgress(silent_check); - UpdateAllCdProgress(silent_check); + // UpdateTotalProgress(silent_check); + // UpdateAllCdProgress(silent_check); if ( UI::WidgetExists( `instLog ) && inst_log != "" ) UI::ChangeWidget(`instLog, `Value, inst_log ); @@ -1602,7 +1613,7 @@ { UI::ChangeWidget(`dumbTab, `CurrentItem, `showRelNotes ); UI::ReplaceWidget(`tabContents, RelNotesPageWidgets() ); - UpdateTotalProgress(false); + // UpdateTotalProgress(false); } } @@ -1698,7 +1709,6 @@ HelpText(), false, false ); // has_back, has_next - y2milestone( "OpenSlideShowBaseDialog calls RebuildDialog" ); RebuildDialog(true); Wizard::SetTitleIcon("yast-sw_single"); @@ -1857,8 +1867,8 @@ { if ( ! ShowingDetails() ) RebuildDialog(false); - else - UpdateTotalProgress(false); + //else + // UpdateTotalProgress(false); // current_slide_no = 0; - do not restart slideshow for next CD } @@ -1963,8 +1973,6 @@ SwitchToDetailsView(true); UpdateAllCdProgress(true); - - y2milestone( "OpenSlideShowDialog done" ); } @@ -2061,6 +2069,8 @@ // assume 15 minutes for installation of openSUSE 11.0, giving 3495 as the constant stage["size"] = ( stage["value"]:0 * 100 ) / 3495 / total_time; stage["start"] = start; + if( stage["size"]:0 + start > 100 ) + stage["size"] = 100 - start; start = start + stage["size"]:0; } Modified: branches/tmp/visnov/progress/storage/StorageClients.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/visnov/progress/storage/S… ============================================================================== --- branches/tmp/visnov/progress/storage/StorageClients.ycp (original) +++ branches/tmp/visnov/progress/storage/StorageClients.ycp Thu Aug 28 15:52:39 2008 @@ -31,7 +31,6 @@ integer f = 100 * cur / max; SlideShow::SubProgress( f, nil ); SlideShow::GenericHandleInput(); -// UI::ChangeWidget (`id(`progress), `Value, f); } global void EnablePopup() @@ -57,10 +56,9 @@ current_action = current_action + 1; - // assume every text change means another action + // hack: assume every text change means another action + y2milestone( "Current action: %1, total stage progress: %2", current_action, current_action * 100 / total_actions ); SlideShow::StageProgress( current_action * 100 / total_actions, nil ); - -// UI::ChangeWidget (`id(`progress), `Label, 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] r50458 - /trunk/bootloader/src/clients/bootloader_finish.ycp
by locilka＠svn.opensuse.org 28 Aug '08

28 Aug '08

Author: locilka Date: Thu Aug 28 15:34:25 2008 New Revision: 50458 URL: http://svn.opensuse.org/viewcvs/yast?rev=50458&view=rev Log: Module Update not needed anymore Modified: trunk/bootloader/src/clients/bootloader_finish.ycp Modified: trunk/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/bootloade… ============================================================================== --- trunk/bootloader/src/clients/bootloader_finish.ycp (original) +++ trunk/bootloader/src/clients/bootloader_finish.ycp Thu Aug 28 15:34:25 2008 @@ -24,7 +24,6 @@ import "Misc"; import "Mode"; import "BootCommon"; -import "Update"; // added for fate# 303395 import "Linuxrc"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0