November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41736 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp
by jsuchome＠svn.opensuse.org 02 Nov '07

02 Nov '07

Author: jsuchome Date: Fri Nov 2 13:42:52 2007 New Revision: 41736 URL: http://svn.opensuse.org/viewcvs/yast?rev=41736&view=rev Log: - correctly escape strings which should be written to config.xml (seen in #338090) - 2.13.20 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Fri Nov 2 13:42:52 2007 @@ -1 +1 @@ -2.13.19 +2.13.20 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Fri Nov 2 13:42:52 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 2 11:02:42 CET 2007 - jsuchome(a)suse.cz + +- correctly escape strings which should be written to config.xml + (seen in #338090) +- 2.13.20 + +------------------------------------------------------------------- Thu Nov 1 10:57:39 CET 2007 - jsuchome(a)suse.cz - save all types from the template to target config.xml Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp Fri Nov 2 13:42:52 2007 @@ -247,9 +247,10 @@ children = children + "\n" + Map2XML (chmap, level + 1); }); else if (subkey == "__value") - value = sformat ("%1", val); + value = String::EscapeTags (sformat ("%1", val)); else if (is (val, string)) - ret = sformat ("%1 %2=\"%3\"", ret, subkey, val); + ret = sformat ("%1 %2=\"%3\"", + ret, subkey, String::EscapeTags (tostring (val))); }); if (non_unique_key[key]:false) return sformat ("%1/>", ret); @@ -275,6 +276,8 @@ return ret; map config = (map) SCR::Read (.kiwi, base_path + "/config.xml"); + if (config == nil) + return ret; map<string,map> packages = config["packages"]:$[]; // rest parts of "packages" are saved in product-creator map ret["ignore"] = maplist (map 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] r41735 - /tags/stable-2_16_3/printer/
by mzugec＠svn.opensuse.org 02 Nov '07

02 Nov '07

Author: mzugec Date: Fri Nov 2 13:06:35 2007 New Revision: 41735 URL: http://svn.opensuse.org/viewcvs/yast?rev=41735&view=rev Log: Created tag stable-2_16_3 for printer Added: tags/stable-2_16_3/printer/ - copied from r41734, 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] r41734 - in /trunk/printer: VERSION package/yast2-printer.changes src/common/dialogs.ycp src/modules/CUPS.ycp src/modules/Printer.ycp src/modules/Printerlib.ycp
by mzugec＠svn.opensuse.org 02 Nov '07

02 Nov '07

Author: mzugec Date: Fri Nov 2 13:06:29 2007 New Revision: 41734 URL: http://svn.opensuse.org/viewcvs/yast?rev=41734&view=rev Log: - show network printers - fixed (problem when password contains space for smb backend)(#332237) - disable edit for raw queues (#247336) - split UI into tabs (not done completly) Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/common/dialogs.ycp trunk/printer/src/modules/CUPS.ycp trunk/printer/src/modules/Printer.ycp trunk/printer/src/modules/Printerlib.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=41734&r1=417… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Fri Nov 2 13:06:29 2007 @@ -1 +1 @@ -2.16.2 +2.16.3 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 Fri Nov 2 13:06:29 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Nov 2 12:54:13 CET 2007 - mzugec(a)suse.cz + +- show network printers - fixed (problem when password contains + space for smb backend)(#332237) +- disable edit for raw queues (#247336) +- split UI into tabs (not done completly) +- 2.16.3 + +------------------------------------------------------------------- Tue Oct 30 15:55:17 CET 2007 - mzugec(a)suse.cz - let the user accept even non-compliant PPDs - (#310177) Modified: trunk/printer/src/common/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs.ycp?r… ============================================================================== --- trunk/printer/src/common/dialogs.ycp (original) +++ trunk/printer/src/common/dialogs.ycp Fri Nov 2 13:06:29 2007 @@ -28,7 +28,8 @@ import "Stage"; import "Wizard"; import "Wizard_hw"; - import "WizardHW"; + import "CWMTab"; + import "CWM"; include "printer/helps.ycp"; include "printer/misc.ycp"; @@ -2144,30 +2145,191 @@ return add (items, `item (`id (-1), _("Other (not detected)"), !selected)); } + + + /** + * Restart detection of printers. + * @return symbol always `next + */ + define symbol runProbeDialog () ``{ + Printer::Detect (); + return `next; + } + + /** + * Run dialog for expert settings + * @return symbol ret (`change_ipp_listen, `cupsd, `cupsusb) + */ + define symbol runCupsExpertDialog() ``{ + + + term contents = `HBox (`HStretch (), `VBox ( + `VStretch (), + `RadioButtonGroup (`id (`rb), + // frame + `Frame (_("Configure CUPS"),`HBox ( + `HSpacing (3), + `VBox ( + `VSpacing (3), + // radiobutton + `Left(`RadioButton( `id(0), _("Change IPP Listen"))), + `Left(`RadioButton( `id(1), _("CUPS Server Se&ttings"))), + `Left(`RadioButton( `id(2), _("CUPS &USB Device Settings"))), + // radiobutton + `VSpacing (3) + ), + `HSpacing (3) + ) + )), + `VStretch () + ), `HStretch ()); + + Wizard::SetContentsButtons (_("Expert CUPS Settings"), contents, getHelpCupsExperts() , + Label::BackButton (), Label::NextButton () ); + + UI::ChangeWidget (`id (`rb), `CurrentButton,0); + + any ret = UI::UserInput(); + if (ret == `next){ + integer option = tointeger(UI::QueryWidget(`id(`rb), `CurrentButton)); + switch (option){ + case 0 : return `change_ipp_listen; + case 1 : return `cupsd; + case 2 : return `cupsusb; + }; + } + return (symbol) ret; + } + +void initServerType (string key) { + CUPS::ReadCupsSettings (); + if (CUPS::InstallationType () == `server){ + UI::ChangeWidget(`id(`server_type), `CurrentButton, `local); + } else { + UI::ChangeWidget(`id(`server_type), `CurrentButton, `remote); + } + if ( contains (CUPS::cups_server_settings["Browsing"]:["On"],"On") ) UI::ChangeWidget(`ipp_listen, `Value, true); +} + +list<string> getAddresses(list<string> addr_orig){ + list<string> addresses=addr_orig; + term contents = `Frame (_("Browsing Settings"), `VBox ( + // selectionbox label + `HBox (`HSpacing (3), `SelectionBox (`id (`addr), _("Browse Addre&sses")), `HSpacing (3)), + `HBox ( + `HSpacing (3), + `PushButton (`id (`add), `opt (`key_F3), Label::AddButton ()), + `PushButton (`id (`edit), `opt (`key_F4), Label::EditButton ()), + `PushButton (`id (`del), `opt (`key_F5), Label::DeleteButton ()), + `HStretch (), + // push button +// `PushButton (`id (`propose_server), _("&Propose")), + `PushButton (`id (`ok), Label::OKButton()), + `HSpacing (3) + ) + )); + UI::OpenDialog(contents); + symbol ret = nil; + do { + UI::ChangeWidget(`addr, `Items, addresses); + boolean enabled = (size(addresses)>0); + UI::ChangeWidget(`edit, `Enabled, enabled); + UI::ChangeWidget(`del, `Enabled, enabled); + ret = (symbol) UI::UserInput(); + string curr = (string)UI::QueryWidget(`addr, `CurrentItem); + switch(ret){ + case `add: + curr=""; + case `edit: + UI::OpenDialog(`VBox(`TextEntry(`id(`ip_addr), _("IP Address"), curr), + `HBox(`PushButton(`id(`cancel), Label::CancelButton()), `PushButton(`id(`ok), Label::OKButton())))); + if ((symbol)UI::UserInput()==`ok){ + list<string> tmp_list = []; + foreach(string row, addresses, { + if (row==curr && curr!="") tmp_list = add(tmp_list, (string)UI::QueryWidget(`ip_addr, `Value)); + else tmp_list = add(tmp_list, row); + }); + if (curr=="") tmp_list = add(tmp_list, (string)UI::QueryWidget(`ip_addr, `Value)); + addresses = tmp_list; + } + UI::CloseDialog(); + break; + case `del: + addresses = filter(string item, addresses, {return (item != curr);}); + break; + case `cancel: + addresses = addr_orig; + case `ok: + ret = nil; + break; + } + }while (ret !=nil); + + UI::CloseDialog(); + return addresses; +} + +symbol handleServerType (string key, map event) ``{ + boolean local = (UI::QueryWidget(`id(`server_type), `CurrentButton) == `local); + + UI::ChangeWidget(`ipp_listen, `Enabled, local); + if (local){ + boolean listen = (boolean)UI::QueryWidget(`ipp_listen, `Value); + UI::ChangeWidget(`select_addr, `Enabled, listen); + } + UI::ChangeWidget(`server_name, `Enabled, !local); + UI::ChangeWidget(`lookup_server, `Enabled, !local); + UI::ChangeWidget(`test_ipp, `Enabled, !local); + UI::ChangeWidget(`use_default, `Enabled, !local); + + boolean use_def=false; + if (!local) use_def=!(boolean) UI::QueryWidget(`use_default, `Value); + UI::ChangeWidget(`queues, `Enabled, use_def); + UI::ChangeWidget(`lookup_queue, `Enabled, use_def); + if (event["EventReason"]:""=="Activated" && event["ID"]:`nil==`select_addr) { + CUPS::cups_server_settings["BrowseAddress"] = getAddresses(CUPS::cups_server_settings["BrowseAddress"]:[]); + } + return nil; +} + +void storeServerType(string key, map event){ + boolean local = (UI::QueryWidget(`id(`server_type), `CurrentButton) == `local); + if (local){ + CUPS::cups_installation=`server; + boolean listen = (boolean)UI::QueryWidget(`ipp_listen, `Value); + CUPS::cups_server_settings["Browsing"] = listen ? ["On"] : ["Off"]; + }else{ + CUPS::cups_installation=`client; + } +} + /** * Function to set the data to the hardware dialog * get inspired by summary and getAutoprobedSelectionBox when writing it */ -void SetHWDialogData () { +list<map<string,any> > o_items = nil; + +void initHWDialogData (string key) { string new_spooler = Spooler::Get (); if (new_spooler == "cups" && CUPS::InstallationType () == `client) new_spooler = "cups-client"; y2milestone("%1", new_spooler); - list < map<string,any> > printers = []; + o_items = []; if (new_spooler == "cups") { list < map<string,any> > items = maplist (map i, Printer::printcap, ``{ y2milestone("printcap %1", i); string def = ""; if (i["name"]:"unknown" == Printer::default_queue) def="Default"; - return $[ "ID":Printerlib::getReplacedString(Printerlib::getUriDevice (i["uri"]:""), false), - "MODEL":i["ppd_info", "model"]:"unknown", - "SPOOL":i["name"]:"unknown", - "DESCR":("" + i["ppd_info", "manufacturer"]:"none" + " " + - " " + i["ppd_info", "model"]:"" + - " / " + i["name"]:"" + " " + - (((boolean)i["shared"]:false)?_("Shared"):_("Not Shared")) + " " + - _(" Connected As ") + Printerlib::getReplacedString(i["uri"]:"none", false)) + " " + - _(" With Spool ") + i["name"]:"none", + return $[ "ID":Printerlib::getReplacedString(Printerlib::getUriDevice (i["uri"]:""), false), + "MODEL":i["ppd_info", "model"]:"unknown", + "SPOOL":i["name"]:"unknown", + "DESCR": sformat("%1 %2 / %3 %4 %5 %6 %7 %8", + i["ppd_info", "manufacturer"]:"none", i["ppd_info", "model"]:"", i["name"]:"", + (((boolean)i["shared"]:false)?_("Shared"):_("Not Shared")), + _("Connected As"), Printerlib::getReplacedString(i["uri"]:"none", false), + _("With Spool"), i["name"]:"none" + ), + "DEFAULT":def ]; }); @@ -2200,7 +2362,7 @@ integer pos=0; Printer::conf_unconf_printers = items; maplist(map<string,any> s, items, { - printers = add(printers, $[ + o_items = add(o_items, $[ "id" : tostring(pos), "rich_descr" : s["DESCR"]:"none", "table_descr":[ @@ -2212,7 +2374,7 @@ pos = pos + 1; }); } else { - printers = [ $[ + o_items = [ $[ "id" : "0", "rich_descr" : "" + CUPS::server_hostname + " " + ((CUPS::server_default == true) ? _("Default Queue") : (_(" With Spool ") + Printer::default_queue)), @@ -2223,164 +2385,239 @@ "" ] ] ]; } - WizardHW::SetContents ( printers ); + list<term> term_items = maplist (map<string,any> i, o_items, { + term t = `item (`id (i["id"]:"")); + foreach (string l, i["table_descr"]:[], { + t = add (t, l); + }); + return t; + }); + UI::ChangeWidget (`id (`_hw_items), `Items, term_items); + if (size(o_items)>0) UI::ChangeWidget(`_hw_sum, `Value, o_items[0, "rich_descr"]:""); + else UI::ChangeWidget(`_hw_sum, `Value, ""); } /** - * Restart detection of printers. - * @return symbol always `next - */ - define symbol runProbeDialog () ``{ - Printer::Detect (); - return `next; - } - - /** - * Run dialog for expert settings - * @return symbol ret (`change_ipp_listen, `cupsd, `cupsusb) - */ - define symbol runCupsExpertDialog() ``{ - - - term contents = `HBox (`HStretch (), `VBox ( - `VStretch (), - `RadioButtonGroup (`id (`rb), - // frame - `Frame (_("Configure CUPS"),`HBox ( - `HSpacing (3), - `VBox ( - `VSpacing (3), - // radiobutton - `Left(`RadioButton( `id(0), _("Change IPP Listen"))), - `Left(`RadioButton( `id(1), _("CUPS Server Se&ttings"))), - `Left(`RadioButton( `id(2), _("CUPS &USB Device Settings"))), - // radiobutton - `VSpacing (3) - ), - `HSpacing (3) - ) - )), - `VStretch () - ), `HStretch ()); - - Wizard::SetContentsButtons (_("Expert CUPS Settings"), contents, getHelpCupsExperts() , - Label::BackButton (), Label::NextButton () ); - - UI::ChangeWidget (`id (`rb), `CurrentButton,0); - - any ret = UI::UserInput(); - if (ret == `next){ - integer option = tointeger(UI::QueryWidget(`id(`rb), `CurrentButton)); - switch (option){ - case 0 : return `change_ipp_listen; - case 1 : return `cupsd; - case 2 : return `cupsusb; - }; - } - return (symbol) ret; - } - - /** * Common detected hardware dialog. * @return symbol for ws */ - define symbol runDetectedDialog () ``{ + define symbol handleDetected (string key, map event) ``{ y2milestone ("Starting detected dialog"); // several functions dialog - WizardHW::CreateHWDialog (_("Printer Configuration"), getComplexHelp (), - [_("Queue Name"),_("Device"), _("Model"), _("Default Queue") ], - [ - [ `redetect, _("Restart Detection") ], - [ `default_q, _("Set Default") ], - [ `cups_expert , _("CUPS Expert Settings") ], - [ `change_ipp_listen, _("Change IPP Listen") ], - [ `change_remote_access, _("Change Remote Access Settings") ] - ]); - SetHWDialogData (); - if (Stage::normal()) Wizard::SetNextButton(`next, Label::FinishButton()); else Wizard::SetNextButton(`next, Label::AcceptButton()); - WizardHW::SetSelectedItem (Printer::runAutoprobedListDialog__current); - - - boolean cont = true; symbol ret=nil; string new_spooler = Spooler::Get (); - while (cont) - { - map<string,any> hw_ret = WizardHW::WaitForEvent (); - map event = hw_ret["event"]:$[]; - string selected = hw_ret["selected"]:""; - ret = (symbol) event["ID"]:nil; - if (tointeger(selected) != nil) Printer::selectPrinter(tointeger(selected)); + integer selected = tointeger( UI::QueryWidget(`id(`_hw_items), `CurrentItem)); + if (selected != nil) Printer::selectPrinter(selected); else Printer::selectPrinter(-1); - if (new_spooler == "cups" && CUPS::InstallationType () == `client) - { - new_spooler = "cups-client"; - } - if (ret == `delete) - { - if (new_spooler == "cups-client") {CUPS::cups_installation=`server;new_spooler="cups";} - else if ( (Printer::conf_unconf_printers[tointeger(selected), "SPOOL"]:"" != "not configured") && Popup::YesNo (sformat (_("Really delete printer %1?"), Printer::printer["name"]:""))) Printer::deletePrinter (); - SetHWDialogData(); - continue; - } + if (new_spooler == "cups" && CUPS::InstallationType () == `client) new_spooler = "cups-client"; + + // FIXME : test if this is string or term + if ( (symbol)event["ID"]:nil==nil ) { ret=nil; } + else{ + ret = (symbol) event["ID"]:nil; + switch((symbol) event["ID"]:nil){ + case `delete : + if (new_spooler == "cups-client") {CUPS::cups_installation=`server;new_spooler="cups";} + else if ( (Printer::conf_unconf_printers[selected, "SPOOL"]:"" != "not configured") && Popup::YesNo (sformat (_("Really delete printer %1?"), Printer::printer["name"]:""))) Printer::deletePrinter (); + initHWDialogData(""); + ret=nil; + break; // TODO handle all events here - else - if (ret == `default_q) - { - Printer::setDefaultPrinter (); - ret = `restart_button; - } - if (ret == `add) - { - Printer::selectPrinter(-1); - ret = `configure_button; - } - if (ret == `edit) - { - if (new_spooler == "cups") - { - if (Printer::printer == $["type":"yast2"]) - { - integer from_detect = -1; - integer count = 0; - string prn_id=""; - - foreach(map<string, any> temp_printer, Printer::Detect(), { - string temp_string = splitstring(temp_printer["uri"]:"", ":")[1]:""; - if (tointeger(selected) >= count) - { - if (Printerlib::getReplacedString(temp_string, false) == - Printer::conf_unconf_printers[tointeger(selected), "ID"]:"") - { - from_detect = from_detect + 1; - break; - } - if (temp_string != prn_id) - { - from_detect = from_detect+1; - prn_id = temp_printer["ID"]:""; - } - count=count + 1; - } - }); - Printer::editDetected(Printer::Detect()[from_detect]:$[]); - y2milestone("Configuring detected, non-configured printer %1", Printer::Detect()[from_detect]:$[]); - } - if (Printer::printer["ppd_info", "model"]:nil == nil) ret=`edit_unconf; - else ret = `edit_button; - } else ret=`connection_cups; - } - else if (ret == `redetect) ret = `restart_button; - cont = false; + case `default_q : + Printer::setDefaultPrinter (); + ret = `restart_button; + break; + case `add : + Printer::selectPrinter(-1); + ret = `configure_button; + break; + case `edit : + if (new_spooler == "cups") + { + if (Printer::printer == $["type":"yast2"]) + { + integer from_detect = -1; + integer count = 0; + string prn_id=""; + foreach(map<string, any> temp_printer, Printer::Detect(), { + string temp_string = splitstring(temp_printer["uri"]:"", ":")[1]:""; + if (selected >= count) + { + if (Printerlib::getReplacedString(temp_string, false) == + Printer::conf_unconf_printers[selected, "ID"]:"") + { + from_detect = from_detect + 1; + break; + } + if (temp_string != prn_id) + { + from_detect = from_detect+1; + prn_id = temp_printer["ID"]:""; + } + count=count + 1; + } + }); + Printer::editDetected(Printer::Detect()[from_detect]:$[]); + y2milestone("Configuring detected, non-configured printer %1", Printer::Detect()[from_detect]:$[]); + } + if (Printer::printer["ppd_info", "model"]:nil == nil) ret=`edit_unconf; + else ret = `edit_button; + } else ret=`connection_cups; + break; + case `redetect: + ret = `restart_button; + break; + default: + if (event["EventReason"]:"" == "SelectionChanged") + { + if (size(o_items)>0) + { + UI::ChangeWidget(`_hw_sum, `Value, o_items[selected, "rich_descr"]:""); + // #247336 - don't allow to edit queues without local filtering (raw:true) + UI::ChangeWidget(`id(`edit), `Enabled, !Printer::printer["raw"]:true); + UI::ChangeWidget(`id(`delete), `Enabled, true); + } else + { + UI::ChangeWidget(`_hw_sum, `Value, ""); + UI::ChangeWidget(`id(`edit), `Enabled, false); + UI::ChangeWidget(`id(`delete), `Enabled, false); + } + } else y2warning("Invalid return: %1, %2", ret, event); + ret = nil; } - return ret; // FIXME } +/* + boolean exists=size((list)UI::QueryWidget(`id(`_hw_items), `Items))>0; + UI::ChangeWidget(`id(`edit), `Enabled, exists); + UI::ChangeWidget(`id(`delete), `Enabled, exists); +*/ + return ret; // FIXME +} + + +void runCups(string key){ + runCupsServerDialog (); +} + + +map<string, map<string,any> > wd = $[ + "SERVER_TYPE" : $[ + "widget" : `custom, + "custom_widget" : + `MarginBox(1,0, + `VBox( + `Frame(_("Print via"), + `RadioButtonGroup( `id( `server_type ), + `VBox( + `VBox( + `Left( `RadioButton(`id(`local), `opt(`notify), "Local CUPS Server")), + `HBox(`CheckBox(`id(`ipp_listen), `opt(`notify), _("Listen to IPP Broadcast Packets")), + `PushButton(`id(`select_addr), _("Select Addresses")) + ) + ), + `VBox( + `Left(`RadioButton(`id(`remote), `opt(`notify), "Remote CUPS Server" )), + `HBox( + `TextEntry(`id(`server_name), _("Server Name")), + `PushButton(`id(`lookup_server), _("Lookup")), + `PushButton(`id(`test_ipp), _("Test Remote IPP Access")) + ), + `CheckBox(`id(`use_default), `opt(`notify), _("Use Server's Default Queue")), + `HBox( + `ComboBox(`id(`queues), _("Queues")), + `PushButton(`id(`lookup_queue), _("Lookup")) + ) + ) + ))), + `VStretch() + )), + "init" : initServerType, + "handle" : handleServerType, + "store" : storeServerType + ], + "OVERVIEW" : $[ + "widget" : `custom, + "custom_widget" : + `VBox( + `VWeight(2,`Table (`id (`_hw_items), `opt (`notify, `immediate), + `header(_("Queue Name"),_("Device"), _("Model"), _("Default Queue")))), + `VWeight(1,`RichText (`id (`_hw_sum), "")), + `HBox ( + `PushButton (`id (`add), Label::AddButton ()), + `PushButton (`id (`edit), _("Configure")), + `PushButton (`id (`delete), Label::DeleteButton ()), + `HStretch () + ) + ), + "init" : initHWDialogData, + "handle" : handleDetected, +// "store" : storeOverview, +// "help" : help["overview"]:"" + ], + "SERVER" : $[ + "widget" : `custom, + "custom_widget" : `Empty(), + "init" : runCups + ] + ]; + +map tabs_descr = $[ + "global" : $[ + "header" : _("Global Settings"), + "contents" : `VBox ( + "SERVER_TYPE" + ), + "widget_names" : ["SERVER_TYPE"] + ], + "overview" : $[ + "header" : _("Printers and Queues"), + "contents" : `VBox ( + "OVERVIEW" + ), + "widget_names" : ["OVERVIEW"] + ], + "server" : $[ + "header" : _("Some server settings"), + "contents" : `VBox (), + "widget_names" : ["SERVER"] + ], +]; + + +symbol runDetectedDialog(){ + + string caption = _("Detected Printers"); + map widget_descr = $[ + "tab": CWMTab::CreateWidget($[ + "tab_order": [ "global", "overview", "server" ], + "tabs": tabs_descr, + "widget_descr": wd, + "initial_tab" : "overview", + "tab_help" : "", + ]), + ]; + term contents = `VBox( "tab"); + + list<map <string, any> > w = CWM::CreateWidgets (["tab"], (map <string, map <string, any> >)widget_descr); + string help = CWM::MergeHelps(w); + contents = CWM::PrepareDialog(contents, w); + + Wizard::SetContentsButtons(caption, contents, help, Label::BackButton (), Label::AcceptButton ()); + Wizard::DisableBackButton(); + + symbol ret = CWM::Run(w, $[]); + + return ret; + +} + + define symbol runRemoteAccessDialog(){ term contents = `HBox (`HStretch (), `VBox ( Modified: trunk/printer/src/modules/CUPS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/CUPS.ycp?rev… ============================================================================== --- trunk/printer/src/modules/CUPS.ycp (original) +++ trunk/printer/src/modules/CUPS.ycp Fri Nov 2 13:06:29 2007 @@ -188,6 +188,9 @@ * @return boolean true on success */ global boolean ReadCupsSettings () { + if (cups_server_settings==nil || cups_server_permissions==nil) + { + list<string> options = (list<string>) SCR::Dir (.etc.cups.cupsd_conf.value); options = toset (options); @@ -222,6 +225,7 @@ y2milestone ("CUPS permissions read: %1", permissions); cups_server_settings = settings; cups_server_permissions = permissions; + } else y2warning("CUPS already readed"); return true; } Modified: trunk/printer/src/modules/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/Printer.ycp?… ============================================================================== --- trunk/printer/src/modules/Printer.ycp (original) +++ trunk/printer/src/modules/Printer.ycp Fri Nov 2 13:06:29 2007 @@ -824,8 +824,7 @@ // because of CUPS1.1->CUPS1.2 cups provide uri also for printers from broadcast // so YaST now show only printers from /etc/cups/printers.conf // ret = filter (map<string,any> e, ret, ``(e["uri"]:"" != "")); -//string cmd="grep -E '<Printer|<DefaultPrinter' /etc/cups/printers.conf|sed -r s/\"<[a-zA-Z]*Printer\\s+\"//g |sed s/\\s*\\>//g"; - string cmd = "grep -E 'DeviceURI' /etc/cups/printers.conf|cut -d' ' -f2"; + string cmd = "grep -E 'DeviceURI' /etc/cups/printers.conf|cut -d' ' -f2-"; list<string> tmp_prns = splitstring(((map<string,any>)SCR::Execute(.target.bash_output, cmd))["stdout"]:"", "\n"); y2milestone("List of local printers before correcting : %1", tmp_prns); Modified: trunk/printer/src/modules/Printerlib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/modules/Printerlib.y… ============================================================================== --- trunk/printer/src/modules/Printerlib.ycp (original) +++ trunk/printer/src/modules/Printerlib.ycp Fri Nov 2 13:06:29 2007 @@ -695,7 +695,7 @@ visible_string = substring(visible_string,0, position) + newString + substring(visible_string, position+3); position = find(visible_string, "%"); } - list pass = regexppos(visible_string, ":[a-zA-Z]+@"); + list pass = regexppos(visible_string, ":[^@]+@"); if (size(pass)==2 && !show_pass){ integer pos = pass[0]:0; integer str_size= pass[1]:0; -- 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] r41733 - /tags/branch-Linux-10_3-2_15_5/backup/
by locilka＠svn.opensuse.org 02 Nov '07

02 Nov '07

Author: locilka Date: Fri Nov 2 13:03:51 2007 New Revision: 41733 URL: http://svn.opensuse.org/viewcvs/yast?rev=41733&view=rev Log: Created tag branch-Linux-10_3-2_15_5 for backup Added: tags/branch-Linux-10_3-2_15_5/backup/ - copied from r41732, branches/SuSE-Linux-10_3-Branch/backup/ -- 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] r41732 - /tags/branch-Linux-10_3-2_15_5/backup/
by locilka＠svn.opensuse.org 02 Nov '07

02 Nov '07

Author: locilka Date: Fri Nov 2 12:57:45 2007 New Revision: 41732 URL: http://svn.opensuse.org/viewcvs/yast?rev=41732&view=rev Log: One more change Removed: tags/branch-Linux-10_3-2_15_5/backup/ -- 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] r41731 - /branches/SuSE-Linux-10_3-Branch/backup/package/yast2-backup.changes
by locilka＠svn.opensuse.org 02 Nov '07

02 Nov '07

Author: locilka Date: Fri Nov 2 12:56:31 2007 New Revision: 41731 URL: http://svn.opensuse.org/viewcvs/yast?rev=41731&view=rev Log: Fixed changefile Modified: branches/SuSE-Linux-10_3-Branch/backup/package/yast2-backup.changes Modified: branches/SuSE-Linux-10_3-Branch/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/backup… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/backup/package/yast2-backup.changes (original) +++ branches/SuSE-Linux-10_3-Branch/backup/package/yast2-backup.changes Fri Nov 2 12:56:31 2007 @@ -5,7 +5,7 @@ - Fixed reading installed packages. - Better solution of some exceptions when creating the archive and temporary directories. -- Fixed escaping backquotes for files presented in UI. +- Fixed escaping quotes and backslashes for files presented in UI. (All in bugzilla #332663) - 2.15.5 -- 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] r41730 - /tags/branch-Linux-10_3-2_15_5/backup/
by locilka＠svn.opensuse.org 02 Nov '07

02 Nov '07

Author: locilka Date: Fri Nov 2 11:07:13 2007 New Revision: 41730 URL: http://svn.opensuse.org/viewcvs/yast?rev=41730&view=rev Log: Created tag branch-Linux-10_3-2_15_5 for backup Added: tags/branch-Linux-10_3-2_15_5/backup/ - copied from r41729, branches/SuSE-Linux-10_3-Branch/backup/ -- 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] r41729 - /tags/branch-Linux-10_3-2_15_5/
by locilka＠svn.opensuse.org 02 Nov '07

02 Nov '07

Author: locilka Date: Fri Nov 2 11:07:12 2007 New Revision: 41729 URL: http://svn.opensuse.org/viewcvs/yast?rev=41729&view=rev Log: Created tag branch-Linux-10_3-2_15_5 Added: tags/branch-Linux-10_3-2_15_5/ -- 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] r41728 - in /branches/SuSE-Linux-10_3-Branch/backup: ./ package/ src/ src/scripts/
by locilka＠svn.opensuse.org 02 Nov '07

02 Nov '07

Author: locilka Date: Fri Nov 2 11:06:13 2007 New Revision: 41728 URL: http://svn.opensuse.org/viewcvs/yast?rev=41728&view=rev Log: - Fixed creating the archive (tar -C). - Fixed reading installed packages. - Better solution of some exceptions when creating the archive and temporary directories. - Fixed escaping backquotes for files presented in UI. (All in bugzilla #332663) - 2.15.5 Modified: branches/SuSE-Linux-10_3-Branch/backup/VERSION branches/SuSE-Linux-10_3-Branch/backup/package/yast2-backup.changes branches/SuSE-Linux-10_3-Branch/backup/src/backup_get_packages.ycp branches/SuSE-Linux-10_3-Branch/backup/src/functions.ycp branches/SuSE-Linux-10_3-Branch/backup/src/scripts/backup_archive.pl branches/SuSE-Linux-10_3-Branch/backup/src/scripts/backup_search.pl branches/SuSE-Linux-10_3-Branch/backup/src/ui.ycp Modified: branches/SuSE-Linux-10_3-Branch/backup/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/backup… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/backup/VERSION (original) +++ branches/SuSE-Linux-10_3-Branch/backup/VERSION Fri Nov 2 11:06:13 2007 @@ -1 +1 @@ -2.15.4 +2.15.5 Modified: branches/SuSE-Linux-10_3-Branch/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/backup… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/backup/package/yast2-backup.changes (original) +++ branches/SuSE-Linux-10_3-Branch/backup/package/yast2-backup.changes Fri Nov 2 11:06:13 2007 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Fri Nov 2 10:59:31 CET 2007 - locilka(a)suse.cz + +- Fixed creating the archive (tar -C). +- Fixed reading installed packages. +- Better solution of some exceptions when creating the archive and + temporary directories. +- Fixed escaping backquotes for files presented in UI. + (All in bugzilla #332663) +- 2.15.5 + +------------------------------------------------------------------- Wed Jul 4 11:13:22 CEST 2007 - locilka(a)suse.cz - Restart and/or enable cron service if needed for changed/added Modified: branches/SuSE-Linux-10_3-Branch/backup/src/backup_get_packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/backup… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/backup/src/backup_get_packages.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/backup/src/backup_get_packages.ycp Fri Nov 2 11:06:13 2007 @@ -30,7 +30,7 @@ string filename = nil; if (is(WFM::Args(0), string)) { - string filename = (string) WFM::Args (0); + filename = (string) WFM::Args (0); } else { y2error ("Wrong parameter for script"); return false; @@ -67,7 +67,7 @@ y2debug("Source %1 description: %2", source_id, source_description); // TODO: really compare whole maps? Have they same keys? - if (contains(installed_products, source_description)) + if (source_description != nil && source_description != $[] && contains(installed_products, source_description)) { product_sources = add(product_sources, source_id); } Modified: branches/SuSE-Linux-10_3-Branch/backup/src/functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/backup… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/backup/src/functions.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/backup/src/functions.ycp Fri Nov 2 11:06:13 2007 @@ -722,22 +722,25 @@ return []; } - string cmd = sformat("%1 backup_get_packages %2", yastbin, temporary_file); + string cmd = sformat("%1 backup_get_packages %2 1>/dev/null 2>/dev/null", yastbin, temporary_file); y2milestone ("Running command: '%1'", cmd); map command = (map) SCR::Execute(.target.bash_output, cmd); - list <string> ret = nil; + list <string> ret = []; if (command["exit"]:nil != 0) { y2error ("Unexpected error: %1", command); - return []; + ret = []; } else { if (FileUtils::Exists (temporary_file)) { ret = (list <string>) SCR::Read (.target.ycp, temporary_file); SCR::Execute (.target.remove, temporary_file); + if (ret == nil) { - return []; + ret = []; y2error ("Error while reading %1", temporary_file); + } else { + y2milestone ("backup_get_packages found %1 packages", ret); } } } Modified: branches/SuSE-Linux-10_3-Branch/backup/src/scripts/backup_archive.pl URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/backup… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/backup/src/scripts/backup_archive.pl (original) +++ branches/SuSE-Linux-10_3-Branch/backup/src/scripts/backup_archive.pl Fri Nov 2 11:06:13 2007 @@ -23,6 +23,19 @@ use File::Temp qw( tempdir ); use POSIX qw( strftime ); +# command line options +my $archive_name = ''; +my $archive_type = ''; +my $help = '0'; +my $store_pt = '0'; +my @ext2_parts = (); +my $verbose = '0'; +my $files_info = ''; +my $comment_file = ''; +my $complete_backup = ''; +my $multi_volume = undef; +my $temp_dir = '/tmp'; + # return all harddisks present in system sub harddisks($) { @@ -61,6 +74,9 @@ if ($ix > 0) { my $dirs = substr($f, 0, $ix); + if ($verbose) { + print "Running: /bin/mkdir -p $dirs 2> /dev/null\n"; + } system("/bin/mkdir -p $dirs 2> /dev/null"); # create directory with parents } } @@ -115,20 +131,6 @@ return $result; } - -# command line options -my $archive_name = ''; -my $archive_type = ''; -my $help = '0'; -my $store_pt = '0'; -my @ext2_parts = (); -my $verbose = '0'; -my $files_info = ''; -my $comment_file = ''; -my $complete_backup = ''; -my $multi_volume = undef; -my $temp_dir = '/tmp'; - # parse command line options GetOptions('archive-name=s' => \$archive_name, 'archive-type=s' => \$archive_type, 'help' => \$help, @@ -210,9 +212,16 @@ } # create parent temporary directory -system("/bin/mkdir -p $temp_dir"); +system("/bin/mkdir -p '$temp_dir'"); +if (! -d $temp_dir) { + die "Cannot create directory $temp_dir: ".$!; +} my $tmp_dir_root = tempdir($temp_dir."/backup_tmp_XXXXXXXX", CLEANUP => 1); # remove directory content at exit +system("/bin/mkdir -p '$tmp_dir_root'"); +if (! -d $tmp_dir_root) { + die "Cannot create directory $tmp_dir_root: ".$!; +} my $tmp_dir = $tmp_dir_root."/tmp"; if (!mkdir($tmp_dir)) @@ -244,7 +253,6 @@ print OUT "info/packages_info.gz\n"; $files_num++; - # store host name use Sys::Hostname; my $host = hostname(); @@ -490,9 +498,11 @@ if ($line =~ /^\/.+/) { - if (-r remove_escape($line) or -l remove_escape($line)) # output only readable files from files-info - # symlinked files need not to be readable - { + my $esc_line = remove_escape($line); + +# if (-r $esc_line or -l $esc_line) # output only readable files from files-info +# # symlinked files need not to be readable +# { print FILES_INFO $line."\n"; if (defined $opened) @@ -504,14 +514,14 @@ else { # star doesn't use escape sequences - print PKGLIST remove_escape($line)."\n"; + print PKGLIST $esc_line."\n"; } } - } - else - { - print "/File not readable: $line\n"; - } +# } +# else +# { +# print "/File not readable: $line\n"; +# } } else { @@ -639,10 +649,20 @@ close(FILES_INFO); # compress file packages_info (avg. ratio is ~10:1) -while (!-e $tmp_dir.'/packages_info.gz') { +my $wait_sec = 60; +if (-e "$tmp_dir/packages_info") { + print "Gzipping $tmp_dir/packages_info\n"; system("/usr/bin/gzip -9 $tmp_dir/packages_info"); - warn 'Cannot create '.$tmp_dir.'/packages_info.gz: '.$!."\n"; - sleep(15); + while ($wait_sec > 0 && ! -e "$tmp_dir/packages_info.gz") { + --$wait_sec; + sleep(1); + } +} elsif (! -e "$tmp_dir/packages_info.gz") { + print ("No such file : $tmp_dir/packages_info"); +} + +if (! -e "$tmp_dir/packages_info.gz") { + print 'Cannot create '.$tmp_dir.'/packages_info.gz: '.$!."\n"; } close(OUT); @@ -671,7 +691,7 @@ # -L <size> volume size in kiB # -V <str> volume prefix label -my $tar_command = "(export LC_ALL=C; tar -c --files-from $tmp_dir/files --ignore-failed-read -C $tmp_dir_root/tmp -S"; +my $tar_command = "(export LC_ALL=C; cd $tmp_dir_root/tmp; tar -c --files-from $tmp_dir/files --ignore-failed-read -C $tmp_dir_root/tmp -S"; if ($verbose) { @@ -781,6 +801,7 @@ # create standard (no multi volume) archive $tar_command .= " -f $archive_name 2> /dev/null)"; + print "Tar command: $tar_command\n"; system($tar_command); } Modified: branches/SuSE-Linux-10_3-Branch/backup/src/scripts/backup_search.pl URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/backup… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/backup/src/scripts/backup_search.pl (original) +++ branches/SuSE-Linux-10_3-Branch/backup/src/scripts/backup_search.pl Fri Nov 2 11:06:13 2007 @@ -346,6 +346,7 @@ # uses global variable exclude_reg_comp (precompiled regular expressions) sub PrintFoundFile($$$$$) { + my ($package_name, $file_for_ycp); my ($file, $ref_package, $widget_file, $output_files, $start_directory) = @_; # $widget_index <-> using the global one @@ -394,9 +395,17 @@ # escaping newline characters is needed because each file # is reported on separate line + + $file_for_ycp = $file; - $file =~ s/\\/\\\\/g; - $file =~ s/\n/\\n/g; + $file_for_ycp =~ s/\\/\\\\/g; + $file_for_ycp =~ s/\n/\\n/g; + $file_for_ycp =~ s/\"/\\"/g; + + $package_name = $$ref_package; + $package_name =~ s/\\/\\\\/g; + $package_name =~ s/\n/\\n/g; + $package_name =~ s/\"/\\"/g; if (!$output_files) { my $size = 0; @@ -410,12 +419,12 @@ if ($widget_file ne "") { - print WIDGETFILE '`item(`id('.$widget_index.'), "X", "'.$file.'", "'.$$ref_package.'"),'."\n"; - print WIDGETFILE2 '`item(`id('.$widget_index.'), " ", "'.$file.'", "'.$$ref_package.'"),'."\n"; + print WIDGETFILE '`item(`id('.$widget_index.'), "X", "'.$file_for_ycp.'", "'.$package_name.'"),'."\n"; + print WIDGETFILE2 '`item(`id('.$widget_index.'), " ", "'.$file_for_ycp.'", "'.$package_name.'"),'."\n"; } if ($list_items_file ne "") { - print LISTITEMSFILE '['.$widget_index.', "'.$file.'"],'."\n"; + print LISTITEMSFILE '['.$widget_index.', "'.$file_for_ycp.'"],'."\n"; } } } Modified: branches/SuSE-Linux-10_3-Branch/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/backup… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/backup/src/ui.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/backup/src/ui.ycp Fri Nov 2 11:06:13 2007 @@ -2002,7 +2002,7 @@ string size_str = substring(line, 0, findfirstof(line, " ")); integer size_line = nil; - if (size_str != nil) { + if (size_str != nil && size_str != "") { size_line = tointeger(size_str); if (size_line != nil) nopkg_size = nopkg_size + size_line; } @@ -2171,7 +2171,15 @@ integer t1 = time(); - list< list<any> > items = (list< list<any> >) SCR::Read(.target.ycp, (string) SCR::Read(.target.tmpdir) + "/items-list.ycp"); + list< list<any> > items = []; + string items_filename = Directory::tmpdir + "/items-list.ycp"; + + if (FileUtils::Exists (items_filename)) { + y2milestone ("Reading %1", items_filename); + items = (list< list<any> >) SCR::Read(.target.ycp, items_filename); + } else { + y2error ("File %1 doesn't exist!", items_filename); + } // dialog header Wizard::SetContents( _("File Selection"), @@ -2179,12 +2187,12 @@ `VSpacing(0.5), // label text `Left(`Label(_("Files to Back Up"))), - `Table(`id(`table), + `Table ( + `id(`table), `opt(`notify), // table header `header(" ", _("Filename"), _("Package")), - // Items are pre-defined in the file - (list<term>) SCR::Read(.target.ycp, (string) SCR::Read(.target.tmpdir) + "/items.ycp") + [] ), `HBox( // push button label @@ -2199,6 +2207,16 @@ backup_help_file_selection(), true, true ); + // Items are pre-defined in the file + string items_filename_show = Directory::tmpdir + "/items.ycp"; + UI::ChangeWidget (`id (`table), `Items, + (FileUtils::Exists (items_filename_show) ? + (list<term>) SCR::Read (.target.ycp, items_filename_show) + : + [`item (`id("none"), ["", _("Internal error"), ""])] + ) + ); + integer t2 = time(); y2milestone("UI finished after %1 seconds", t2 - t1); -- 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] r41727 - /tags/stable-2_16_2/packager/
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 17:08:41 2007 New Revision: 41727 URL: http://svn.opensuse.org/viewcvs/yast?rev=41727&view=rev Log: Created tag stable-2_16_2 for packager Added: tags/stable-2_16_2/packager/ - copied from r41726, 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