[yast-commit] r61239 - in /branches/SuSE-Code-11-SP1-Branch/printer: VERSION package/yast2-printer.changes src/Printer.ycp src/printer_auto.ycp

Author: jsmeix Date: Wed Mar 10 17:12:04 2010 New Revision: 61239 URL: http://svn.opensuse.org/viewcvs/yast?rev=61239&view=rev Log: - Avoid bnc#582680 "sometimes no cupsd accessible on localhost while cloning the system" by no longer calling AutodetectQueues (and Printerlib::DetermineClientOnly) in Printer::Export because their results are currently not used in the "Export" map (currently it contains only the content of the system config files /etc/cups/client.conf and /etc/cups/cupsd.conf). - 2.17.63 Modified: branches/SuSE-Code-11-SP1-Branch/printer/VERSION branches/SuSE-Code-11-SP1-Branch/printer/package/yast2-printer.changes branches/SuSE-Code-11-SP1-Branch/printer/src/Printer.ycp branches/SuSE-Code-11-SP1-Branch/printer/src/printer_auto.ycp Modified: branches/SuSE-Code-11-SP1-Branch/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/printer/VERSION?rev=61239&r1=61238&r2=61239&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/printer/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/printer/VERSION Wed Mar 10 17:12:04 2010 @@ -1 +1 @@ -2.17.62 +2.17.63 Modified: branches/SuSE-Code-11-SP1-Branch/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/printer/package/yast2-printer.changes?rev=61239&r1=61238&r2=61239&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/printer/package/yast2-printer.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/printer/package/yast2-printer.changes Wed Mar 10 17:12:04 2010 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Mar 10 16:42:52 CET 2010 - jsmeix@suse.de + +- Avoid bnc#582680 "sometimes no cupsd accessible on localhost + while cloning the system" by no longer calling + AutodetectQueues (and Printerlib::DetermineClientOnly) + in Printer::Export because their results are currently + not used in the "Export" map (currently it contains only + the content of the system config files /etc/cups/client.conf + and /etc/cups/cupsd.conf). +- 2.17.63 + +------------------------------------------------------------------- Mon Mar 1 14:00:30 CET 2010 - mzugec@suse.de - fixed creating valid autoyast profile (bnc#583565) Modified: branches/SuSE-Code-11-SP1-Branch/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/printer/src/Printer.ycp?rev=61239&r1=61238&r2=61239&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/printer/src/Printer.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/printer/src/Printer.ycp Wed Mar 10 17:12:04 2010 @@ -51,6 +51,12 @@ global boolean modified = false; /** + * Set by AutoYaST by calling in printer_auto.ycp the "SetModified" function. + * Preset to false which is the right default for AutoYast. + */ +global boolean printer_auto_modified = false; + +/** */ global boolean proposal_valid = false; @@ -1926,10 +1932,15 @@ } /** - * Get all printer settings from the first parameter - * (For use by autoinstallation.) - * @param settings The YCP structure to be imported. - * @return boolean True on success + * Write printer settings according to the parameter settings map which + * contains a "cups_remote_server" sub-map and a "server_settings" sub-map + * via Printerlib::WriteClientSettings to /etc/cups/client.conf and + * via Printerlib::WriteCupsSettings to /etc/cups/cupsd.conf + * where empty sub-maps result empty system config files. + * For use by autoinstallation (called in printer_auto.ycp) and + * also called in printer_proposal.ycp in its "AskUser" function. + * @param settings The YCP map to be imported. + * @return boolean True in any case. */ global boolean Import (map settings) { Printerlib::WriteClientSettings(settings["cups_remote_server"]:$[]); @@ -1938,34 +1949,25 @@ } /** - * Dump the printer settings to a single map - * (For use by autoinstallation.) - * @return map Dumped settings (later acceptable by Import ()) + * Dump printer settings to a single map which contains + * the cupsd.conf entries in a "server_settings" sub-map and + * the client.conf entries in a "cups_remote_server" sub-map. + * For use by autoinstallation (called in printer_auto.ycp) and + * also called in printer_proposal.ycp in its "AskUser" function. + * @return map Dumped settings (later acceptable by Printer::Import(map) ) */ global map Export () { - Printerlib::DetermineClientOnly(); - Printer::AutodetectQueues(); - list <map> p_queues = filter(map queue, Printer::queues, { return (queue["config"]:""=="local"); }); +// Printerlib::DetermineClientOnly(); +// Printer::AutodetectQueues(); +// list <map> p_queues = filter(map queue, Printer::queues, { return (queue["config"]:""=="local"); }); map exp = $[ // "queues" : p_queues, // "filters" : Printerlib::ExportFilters( p_queues ), "server_settings" : (map)SCR::Read(.cups.server), "cups_remote_server" : (map)SCR::Read(.cups.client) ]; -//y2internal("export %1", exp); return exp; } -/** - * Return packages needed to be installed and removed during - * Autoinstallation to insure module has all needed software - * installed. - * @return map with 2 lists. - */ -global map AutoPackages() { - // TODO FIXME: your code here... - return $[ "install":[], "remove":[] ]; -} - /* EOF */ } Modified: branches/SuSE-Code-11-SP1-Branch/printer/src/printer_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/printer/src/printer_auto.ycp?rev=61239&r1=61238&r2=61239&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/printer/src/printer_auto.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/printer/src/printer_auto.ycp Wed Mar 10 17:12:04 2010 @@ -22,7 +22,8 @@ * File: clients/printer_auto.ycp * Package: Configuration of printer * Summary: Client for autoinstallation - * Authors: Johannes Meixner + * Authors: Michal Zugec + * Johannes Meixner * * $Id: printer_auto.ycp 27914 2006-02-13 14:32:08Z locilka $ * @@ -47,6 +48,7 @@ y2milestone("Printer auto started"); import "Printer"; +import "Printerlib"; include "printer/wizards.ycp"; any ret = nil; @@ -59,52 +61,87 @@ if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) param = (map) WFM::Args(1); } -y2debug("func=%1", func); -y2debug("param=%1", param); - -/* Create a summary*/ -if(func == "Summary") { - ret = Printer::QueueItems( true, true )[0]:[]; -} -/* Reset configuration */ -else if (func == "Reset") { - Printer::Import($[]); - ret = $[]; -} -// TODO: use global value to set Printer::dirty -else if (func == "GetModified") { - ret = true; - } -/* Change configuration (run AutoSequence) */ -else if (func == "Change") { - ret = PrinterAutoSequence(); -} -/* Import configuration */ -else if (func == "Import") { - ret = Printer::Import(param); -} -/* Return actual state */ -else if (func == "Export") { - ret = Printer::Export(); -} -/* Return needed packages */ -else if (func == "Packages") { - ret = Printer::AutoPackages(); -} -/* Read current state */ -else if (func == "Read") { - import "Progress"; - boolean progress_orig = Progress::set (false); - ret = Printer::Read(); - Progress::set (progress_orig); -} -/* Write givven settings */ -else if (func == "Write") { - import "Progress"; - boolean progress_orig = Progress::set (false); - Printer::write_only = true; - ret = Printer::Write(); - Progress::set (progress_orig); +//y2debug("func=%1", func); +//y2debug("param=%1", param); +y2milestone("Printer auto func='%1'", func); +y2milestone("Printer auto param='%1'", param); + +/* Create a summary string */ +if (func == "Summary") +{ ret = _("AutoYaST printer client settings."); +} +/* Reset configuration to empty system config files */ +else if (func == "Reset") +{ // The empty map results empty /etc/cups/client.conf and /etc/cups/cupsd.conf files: + Printer::Import($[]); + ret = $[]; +} +/* Called appropriately by the AutoYaST framework */ +else if (func == "SetModified") +{ Printer::printer_auto_modified = true; + ret = true; +} +/* Provide to AutoYaST what it did set before (or the default "false") */ +else if (func == "GetModified") +{ ret = Printer::printer_auto_modified; +} +/* Change configuration (run the wizards AutoSequence dialogs) */ +else if (func == "Change") +{ // Even if cups_client is not installed, the MainSequence dialogs + // which are called via PrinterAutoSequence in wizards.ycp + // (starting as usual with the Overview dialog) + // should at least show an endless sequence of errors to the user. + ret = PrinterAutoSequence(); +} +/* Import printer configuration and Write it to the system config files */ +else if (func == "Import") +{ ret = Printer::Import(param); +} +/* Read printer configuration from the system config files and return it as a map */ +else if (func == "Export") +{ ret = Printer::Export(); +} +/* + * Return packages needed to be installed and removed during + * Autoinstallation to insure it has all needed software installed. + * @return map with 2 lists of strings $["install":[],"remove":[]] + */ +else if (func == "Packages") +{ list< string > to_be_installed_packages = []; + if( Printerlib::TestAndInstallPackage( "cups-client", "installed" ) ) + { to_be_installed_packages = add( to_be_installed_packages, "cups-client" ); + } + if( Printerlib::TestAndInstallPackage( "cups", "installed" ) ) + { to_be_installed_packages = add( to_be_installed_packages, "cups" ); + } + ret = $[ "install":to_be_installed_packages, "remove":[] ]; +} +/* Dummy to provide a Read function for the AutoYaST framework */ +else if (func == "Read") +{ // Do not call Printer::Read() here to + // avoid that the hardware proposal asks the user + // to install the packages cups-client and cups, see + // https://bugzilla.novell.com/show_bug.cgi?id=445719#c13 + //import "Progress"; + //boolean progress_orig = Progress::set (false); + //ret = Printer::Read(); + //Progress::set (progress_orig); + y2milestone("Not calling Printer::Read() to avoid that printer_auto asks to install cups-client and cups."); + ret = true; +} +/* Dummy to provide a Write function for the AutoYaST framework */ +else if (func == "Write") +{ // There is no need to call Printer::Write() here because + // it does actually nothing except to exit verbosely, see + // http://en.opensuse.org/YaST/Development/Printer_Enhancement#Basic_Implementa...: + // for background information. + //import "Progress"; + //boolean progress_orig = Progress::set (false); + //Printer::write_only = true; + //ret = Printer::Write(); + //Progress::set (progress_orig); + y2milestone("No need to call Printer::Write() in printer_auto because it does nothing."); + ret = true; } /* Unknown function */ else { @@ -112,7 +149,8 @@ ret = false; } -y2debug("ret=%1", ret); +//y2debug("ret=%1", ret); +y2milestone("Printer auto ret='%1'", ret); y2milestone("Printer auto finished"); y2milestone("----------------------------------------"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org