April 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r46993 - /tags/stable-2_16_7/update/
by locilka＠svn.opensuse.org 23 Apr '08

23 Apr '08

Author: locilka Date: Wed Apr 23 15:38:49 2008 New Revision: 46993 URL: http://svn.opensuse.org/viewcvs/yast?rev=46993&view=rev Log: Created tag stable-2_16_7 for update Added: tags/stable-2_16_7/update/ - copied from r46992, trunk/update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46992 - in /trunk/update: VERSION package/yast2-update.changes
by locilka＠svn.opensuse.org 23 Apr '08

23 Apr '08

Author: locilka Date: Wed Apr 23 15:38:02 2008 New Revision: 46992 URL: http://svn.opensuse.org/viewcvs/yast?rev=46992&view=rev Log: new version Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=46992&r1=4699… ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Wed Apr 23 15:38:02 2008 @@ -1 +1 @@ -2.16.6 +2.16.7 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Wed Apr 23 15:38:02 2008 @@ -5,6 +5,7 @@ old update client is left to handle command-line or to call the new client (bnc #382044). - Fixed update proposal not to propose two kernels (bnc #382208). +- 2.16.7 ------------------------------------------------------------------- Fri Apr 11 18:05:54 CEST 2008 - locilka(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46991 - in /trunk/update: package/yast2-update.changes src/clients/update_proposal.ycp
by locilka＠svn.opensuse.org 23 Apr '08

23 Apr '08

Author: locilka Date: Wed Apr 23 15:36:46 2008 New Revision: 46991 URL: http://svn.opensuse.org/viewcvs/yast?rev=46991&view=rev Log: - Fixed update proposal not to propose two kernels (bnc #382208). Modified: trunk/update/package/yast2-update.changes trunk/update/src/clients/update_proposal.ycp Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Wed Apr 23 15:36:46 2008 @@ -4,6 +4,7 @@ - Added new client for run_update that does the real update, the old update client is left to handle command-line or to call the new client (bnc #382044). +- Fixed update proposal not to propose two kernels (bnc #382208). ------------------------------------------------------------------- Fri Apr 11 18:05:54 CEST 2008 - locilka(a)suse.cz Modified: trunk/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update_propos… ============================================================================== --- trunk/update/src/clients/update_proposal.ycp (original) +++ trunk/update/src/clients/update_proposal.ycp Wed Apr 23 15:36:46 2008 @@ -323,6 +323,8 @@ Packages::SelectProduct(); Pkg::ActivateSelections (); // now go through all selected selections and select their packages + // bnc #382208 + SelectKernelPackages (); // FATE #301990, Bugzilla #238488 // Control the upgrade process better @@ -331,7 +333,6 @@ y2milestone ("Update summary: %1", update_sum); Update::unknown_packages = update_sum[`ProblemListSze]:0; - SelectKernelPackages (); list<string> sys_patterns = Packages::ComputeSystemPatternList (); foreach (string pat, sys_patterns, { Pkg::ResolvableInstall (pat, `pattern); -- 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] r46990 - in /trunk/update: package/yast2-update.changes src/clients/Makefile.am src/clients/run_update.ycp src/clients/update.ycp yast2-update.spec.in
by locilka＠svn.opensuse.org 23 Apr '08

23 Apr '08

Author: locilka Date: Wed Apr 23 15:33:28 2008 New Revision: 46990 URL: http://svn.opensuse.org/viewcvs/yast?rev=46990&view=rev Log: - Added new client for run_update that does the real update, the old update client is left to handle command-line or to call the new client (bnc #382044). Added: trunk/update/src/clients/run_update.ycp Modified: trunk/update/package/yast2-update.changes trunk/update/src/clients/Makefile.am trunk/update/src/clients/update.ycp trunk/update/yast2-update.spec.in Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Wed Apr 23 15:33:28 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 23 15:29:55 CEST 2008 - locilka(a)suse.cz + +- Added new client for run_update that does the real update, the + old update client is left to handle command-line or to call + the new client (bnc #382044). + +------------------------------------------------------------------- Fri Apr 11 18:05:54 CEST 2008 - locilka(a)suse.cz - Added missing </p> (bnc #377476). Modified: trunk/update/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/Makefile.am?r… ============================================================================== --- trunk/update/src/clients/Makefile.am (original) +++ trunk/update/src/clients/Makefile.am Wed Apr 23 15:33:28 2008 @@ -12,7 +12,8 @@ packages_proposal.ycp \ backup_proposal.ycp \ update.ycp \ - inst_update_partition.ycp + inst_update_partition.ycp \ + run_update.ycp EXTRA_DIST = $(client_DATA) Added: trunk/update/src/clients/run_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/run_update.yc… ============================================================================== --- trunk/update/src/clients/run_update.ycp (added) +++ trunk/update/src/clients/run_update.ycp Wed Apr 23 15:33:28 2008 @@ -0,0 +1,49 @@ +/** + * File: clients/update.ycp + * Module: System update + * Summary: Update client that actually does the update + * it's called from ypdate.ycp + * Authors: Klaus Kaempf <kkaempf(a)suse.de> + * Arvin Schnell <arvin(a)suse.de> + * Lukas Ocilka <locilka(a)suse.cz> + * + * $Id$ + */ + +{ + textdomain "update"; + + import "PackageLock"; + import "Mode"; + import "ProductControl"; + import "Wizard"; + import "Update"; + + // check whether having the packager for ourselves + if (! PackageLock::Check ()) + return `abort; + + // set normal mode and update + Mode::SetMode ("update"); + + Update::disallow_upgrade = true; + Update::onlyUpdateInstalled = true; + Update::deleteOldPackages = false; + + ProductControl::custom_control_file = "/usr/share/YaST2/control/update.xml"; + + Wizard::OpenNextBackStepsDialog(); + Wizard::SetNextButton(`next, _("&Update")); + if (!ProductControl::Init()) + { + y2error("control file %1 not found", ProductControl::custom_control_file ); + } + list<map> stage_mode = [$["stage": "normal", "mode": Mode::mode() ]]; + ProductControl::AddWizardSteps(stage_mode); + + symbol ret = ProductControl::Run(); + + Wizard::CloseDialog (); + + return `next; +} Modified: trunk/update/src/clients/update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update.ycp?re… ============================================================================== --- trunk/update/src/clients/update.ycp (original) +++ trunk/update/src/clients/update.ycp Wed Apr 23 15:33:28 2008 @@ -12,14 +12,9 @@ { textdomain "update"; - import "Mode"; - import "Update"; - import "Wizard"; - import "ProductControl"; - import "Label"; - import "Mode"; import "GetInstArgs"; import "CommandLine"; + import "Mode"; // Bugzilla #269910, CommanLine "support" // argmap is only a map, CommandLine uses string parameters @@ -31,33 +26,9 @@ return `auto; } - // somewhere, DirInstall is imported that wants Pkg in the constructor - import "PackageLock"; - // check whether having the packager for ourselves - if (! PackageLock::Check ()) - return `abort; - - // set normal mode and update - Mode::SetMode ("update"); - - Update::disallow_upgrade = true; - Update::onlyUpdateInstalled = true; - Update::deleteOldPackages = false; - - ProductControl::custom_control_file = "/usr/share/YaST2/control/update.xml"; - - Wizard::OpenNextBackStepsDialog(); - Wizard::SetNextButton(`next, _("&Update")); - if (!ProductControl::Init()) - { - y2error("control file %1 not found", ProductControl::custom_control_file ); - } - list<map> stage_mode = [$["stage": "normal", "mode": Mode::mode() ]]; - ProductControl::AddWizardSteps(stage_mode); - - symbol ret = ProductControl::Run(); - - Wizard::CloseDialog (); + y2milestone ("Running: run_update"); + symbol ret = (symbol) WFM::CallFunction ("run_update", WFM::Args()); + y2milestone ("Returned: %1", ret); - return `next; + return ret; } Modified: trunk/update/yast2-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=… ============================================================================== --- trunk/update/yast2-update.spec.in (original) +++ trunk/update/yast2-update.spec.in Wed Apr 23 15:33:28 2008 @@ -77,3 +77,4 @@ @desktopdir@/update.desktop /usr/share/YaST2/control/update.xml @clientdir@/update.ycp +@clientdir@/run_update.ycp -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46989 - /tags/stable-2_16_3/dirinstall/
by lslezak＠svn.opensuse.org 23 Apr '08

23 Apr '08

Author: lslezak Date: Wed Apr 23 15:33:06 2008 New Revision: 46989 URL: http://svn.opensuse.org/viewcvs/yast?rev=46989&view=rev Log: Created tag stable-2_16_3 for dirinstall Added: tags/stable-2_16_3/dirinstall/ - copied from r46988, trunk/dirinstall/ -- 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] r46988 - in /trunk/dirinstall: VERSION package/yast2-dirinstall.changes src/clients/dirinstall.ycp
by lslezak＠svn.opensuse.org 23 Apr '08

23 Apr '08

Author: lslezak Date: Wed Apr 23 15:33:02 2008 New Revision: 46988 URL: http://svn.opensuse.org/viewcvs/yast?rev=46988&view=rev Log: - install all available products, base product flag has been dropped (similar problem to bnc#359538) - 2.16.3 Modified: trunk/dirinstall/VERSION trunk/dirinstall/package/yast2-dirinstall.changes trunk/dirinstall/src/clients/dirinstall.ycp Modified: trunk/dirinstall/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/VERSION?rev=46988&r1=… ============================================================================== --- trunk/dirinstall/VERSION (original) +++ trunk/dirinstall/VERSION Wed Apr 23 15:33:02 2008 @@ -1 +1 @@ -2.16.2 +2.16.3 Modified: trunk/dirinstall/package/yast2-dirinstall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/package/yast2-dirinst… ============================================================================== --- trunk/dirinstall/package/yast2-dirinstall.changes (original) +++ trunk/dirinstall/package/yast2-dirinstall.changes Wed Apr 23 15:33:02 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Apr 23 15:27:08 CEST 2008 - lslezak(a)suse.cz + +- install all available products, base product flag has been + dropped (similar problem to bnc#359538) +- 2.16.3 + +------------------------------------------------------------------- Fri Apr 18 08:52:12 CEST 2008 - lslezak(a)suse.cz - do not create a copy of the installation source Modified: trunk/dirinstall/src/clients/dirinstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/clients/dirinstal… ============================================================================== --- trunk/dirinstall/src/clients/dirinstall.ycp (original) +++ trunk/dirinstall/src/clients/dirinstall.ycp Wed Apr 23 15:33:02 2008 @@ -77,20 +77,6 @@ list<map<string,any> > prods = Pkg::ResolvableProperties ("", `product, ""); y2milestone("Found products: %1", prods); - list<map<string,any> > base_l = filter (map<string,any> p, prods, { - return p["category"]:"" == "base"; - }); - - map<string,any> base = base_l[0]:$[]; - if (size (base_l) == 0) - { - y2warning ("No base product found, using first found product"); - base = prods[0]:$[]; - } - - y2milestone ("Found base product: %1", base); - prods = Pkg::ResolvableProperties (base["name"]:"", `product, ""); - y2milestone ("Found appropriate base products in repositories: %1", prods); if (size (prods) == 0) { // error report @@ -99,8 +85,12 @@ return `abort; } - // select the base product for installation - Pkg::ResolvableInstall(base["name"]:"", `product); + foreach(map<string,any> prod, prods, + { + // select all products for installation + Pkg::ResolvableInstall(prod["name"]:"", `product); + } + ); symbol ret = Run (); -- 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] r46987 - /tags/stable-2_16_17/printer/
by mzugec＠svn.opensuse.org 23 Apr '08

23 Apr '08

Author: mzugec Date: Wed Apr 23 15:25:00 2008 New Revision: 46987 URL: http://svn.opensuse.org/viewcvs/yast?rev=46987&view=rev Log: Created tag stable-2_16_17 for printer Added: tags/stable-2_16_17/printer/ - copied from r46986, 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] r46986 - in /trunk/printer: VERSION package/yast2-printer.changes src/common/dialogs-connection.ycp src/common/dialogs.ycp src/common/wizards.ycp src/modules/Printer.ycp
by mzugec＠svn.opensuse.org 23 Apr '08

23 Apr '08

Author: mzugec Date: Wed Apr 23 15:24:29 2008 New Revision: 46986 URL: http://svn.opensuse.org/viewcvs/yast?rev=46986&view=rev Log: fixed "add" printer (bnc#382074) Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/common/dialogs-connection.ycp trunk/printer/src/common/dialogs.ycp trunk/printer/src/common/wizards.ycp trunk/printer/src/modules/Printer.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=46986&r1=469… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Wed Apr 23 15:24:29 2008 @@ -1 +1 @@ -2.16.16 +2.16.17 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Wed Apr 23 15:24:29 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 23 14:50:59 CEST 2008 - mzugec(a)suse.cz + +- fixed "add" printer (bnc#382074) +- 2.16.17 + +------------------------------------------------------------------- Wed Apr 23 10:42:22 CEST 2008 - mzugec(a)suse.cz - improved "global" settings layout (bnc#381353) Modified: trunk/printer/src/common/dialogs-connection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs-conne… ============================================================================== --- trunk/printer/src/common/dialogs-connection.ycp (original) +++ trunk/printer/src/common/dialogs-connection.ycp Wed Apr 23 15:24:29 2008 @@ -309,7 +309,7 @@ * Dialog for create queue for existing printer * @return symbol wizard sequencer symbol */ -define symbol runNewQueueDialog() ``{ +define symbol runNewQueueDialog(symbol retval) ``{ list<term> printers = []; integer current = 0; term contents = `VBox(); @@ -381,12 +381,15 @@ }); map <string, any> tmp_map = Printer::printcap[from_detect]:$[]; -tmp_map["name"] = Printer::generateQueueName(nil, tmp_map["uri"]:"", + tmp_map["name"] = Printer::generateQueueName(nil, tmp_map["uri"]:"", tmp_map["vendor_db"]:"", tmp_map["device_db"]:"", Printer::getForbiddenNames()); Printer::editDetected(tmp_map); y2milestone("Configuring detected, non-configured printer"); -return nil; + return retval; +/* + return nil; return `edit_button; +*/ } return nil; return `next; @@ -398,6 +401,7 @@ * @return symbol wizard sequencer symbol */ define symbol runConnectionTypeDialog (boolean local) ``{ +y2internal("runConnectionTypeDialog"); symbol selected = Printer::connection_type_selected; boolean add_queue = false; if (size (getConfiguredPrinters ()) != 0 && Printer::confmode == `adm) add_queue = true; @@ -462,8 +466,7 @@ // frame label "", //_("Printer Type"), getConnectionTypeHelp (add_queue), `connection_type); - if (ret == `lpd) - Printer::printer["proposed_raw"] = true; + if (ret == `lpd) Printer::printer["proposed_raw"] = true; return (symbol)ret; } 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 Wed Apr 23 15:24:29 2008 @@ -2089,7 +2089,7 @@ // TODO handle all events here case `add : Printer::selectPrinter(-1); - ret = `configure_button; + ret = `add_button; break; case `edit : if (new_spooler == "cups") @@ -2123,9 +2123,6 @@ else ret = `edit_button; } else ret=`connection_cups; break; - case `redetect: - ret = `restart_button; - break; case `test : // error report /* @@ -2140,6 +2137,7 @@ ret = nil; } } +y2internal("ret %1", ret); return ret; // FIXME } @@ -2642,7 +2640,7 @@ `PushButton(`id(`next), Label::OKButton())) ); UI::OpenDialog(contents); - runNewQueueDialog(); + runNewQueueDialog(nil); UI::CloseDialog(); initBasic(""); } Modified: trunk/printer/src/common/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/wizards.ycp?r… ============================================================================== --- trunk/printer/src/common/wizards.ycp (original) +++ trunk/printer/src/common/wizards.ycp Wed Apr 23 15:24:29 2008 @@ -99,7 +99,7 @@ "printer_type" : ``(runPrinterTypeDialog()), "add_local_printer":``(runConnectionTypeDialog(true)), "add_remote_printer":``(runConnectionTypeDialog(false)), - "add_new_queue" : ``(runNewQueueDialog()), + "add_new_queue" : ``(runNewQueueDialog(`edit_button)), // "advanced" : ``(runAdvancedDialog ()), // "cupsd" : ``(runCupsServerDialog ("")), "cupsaclroot" : ``(runCupsAclDialog (`root)), @@ -138,7 +138,7 @@ ]; Printer::default_queue = "lp"; Printer::selectPrinter (3); - list<string> seq = [ "main", "configdetected", "quick", "complex", "connection_local", "usb", "name", "model", "filter", "featues", "edit", ]; + list<string> seq = [ "main", "configdetected", "quick", "complex", "connection_local", "usb", "name", /*"model",*/ "filter", "featues", "edit", ]; foreach (string i, seq, ``{ eval (getAliases ()[i]:nil); }); @@ -261,7 +261,14 @@ "edit2" : $[ `next : `next, `abort: `abort +// `add : "add_printer_sub_wz" ] +/* + "add_printer_sub_wz" : $[ + `next : `next, + `abort: `abort + ] +*/ ]; // if (configured == false) sequence["ws_start"] = "model"; aliases = (map<string,any>)filter (string k, any v, aliases, ``(haskey (sequence, k))); @@ -375,10 +382,16 @@ "name_auto" : $[ `abort : `abort, - `next : "model", +// `next : "model", + `next : "edit2", `raw : "storeprinter", `class : "members", ], + "edit2" : $[ + `next : `next, + `abort : `abort + ], +/* "model" : $[ `abort : `abort, `next : `edit, @@ -387,18 +400,19 @@ `downloadppd : "downloadppd", `select_ppd : "ppdselect_all", ], +*/ "ppdselect_all" : $[ `abort : `abort, `next : `edit, - `select_model : "model", +// `select_model : "model", ], "useppd" : $[ `abort : `abort, - `next : "model", +// `next : "model", ], "downloadppd" : $[ `abort : `abort, - `next: "model", +// `next: "model", ], "members" : $[ `abort : `abort, @@ -470,6 +484,7 @@ `abort : `abort, `configure_button : "add_printer_wz", // `restart_button : "redetect", + `add_button : "add_printer_wz", `edit_button : "edit2", `edit_unconf : "edit_printer_unconf", // `change_ipp_listen : "listen_ipp_bcast", 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 Wed Apr 23 15:24:29 2008 @@ -2107,20 +2107,28 @@ global define void editDetected (map det) ``{ // (FaTE#120083) Avoid the Automated Setup For "Non-Recommended" Printers boolean problematic = false; - map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, sformat("grep '%1' %2|tr -d '\n'", det["device"]:"", - "/usr/share/YaST2/data/printer/printers_support")); -y2internal("%1", cmd); - if (cmd["exit"]:-1==0) { - string status = splitstring(cmd["stdout"]:"", "|")[2]:""; - if (status!="full"){ + string model = String::CutBlanks(det["device"]: det["ppd_info", "model"]:""); + if (size(model)==0) y2warning("Couldn't detect model from %1", det); + else { + string command = sformat("grep '%1' %2|tr -d '\n'", model, "/usr/share/YaST2/data/printer/printers_support"); + y2internal("executing command %1", command); + map<string, any> cmd = (map<string, any>)SCR::Execute(.target.bash_output, command); + y2internal("%1", cmd); + if (cmd["exit"]:-1==0) { + string status = splitstring(cmd["stdout"]:"", "|")[2]:""; + if (status!="full" && size(status)>0){ problematic=true; Popup::Warning(sformat("%1 %2 %3 '%4'", _("Selected printer"), splitstring(cmd["stdout"]:"", "|")[1]:"", _("will not be autoconfigured\n because it's not fully supported. Supported status is"), status)); + } } } Printerdb::InstallDrivers (); index = -1; y2debug ("Editing printer %1", det); - string filename = (problematic) ? "" : Printerdb::getAutoPpdFile ( det["vendor_db"]:"", det["device_db"]:"" ); +y2internal ("Editing printer %1", det); +string vendor = det["vendor_db"]: det["ppd_info", "manufacturer_db"]:""; +string device = det["device_db"]: det["ppd_info", "model_db"]:""; + string filename = (problematic) ? "" : Printerdb::getAutoPpdFile ( vendor, device ); y2debug ("Filename: %1", filename); printer = $[ "detected" : det, -- 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] r46985 - in /trunk/packager: package/yast2-packager.changes src/modules/Packages.ycp src/modules/SlideShow.ycp
by lslezak＠svn.opensuse.org 23 Apr '08

23 Apr '08

Author: lslezak Date: Wed Apr 23 15:17:53 2008 New Revision: 46985 URL: http://svn.opensuse.org/viewcvs/yast?rev=46985&view=rev Log: - do not check product category (it is obsoleted), install all products (bnc#359538) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp trunk/packager/src/modules/SlideShow.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Apr 23 15:17:53 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 23 15:05:22 CEST 2008 - lslezak(a)suse.cz + +- do not check product category (it is obsoleted), install all + products (bnc#359538) + +------------------------------------------------------------------- Mon Apr 21 14:17:55 CEST 2008 - locilka(a)suse.cz - Added new function DefaultDesktop::SelectedDesktops() to list all Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Wed Apr 23 15:17:53 2008 @@ -1314,14 +1314,13 @@ global boolean SelectProduct () { Packages::Initialize (true); list<map<string,any> > products = Pkg::ResolvableProperties ("", `product, ""); - products = filter (map<string,any> p, products, { - return p["category"]:"" == "base"; - }); + if (size (products) == 0) { - y2milestone ("No base product found on media"); + y2milestone ("No product found on media"); return true; } + list<map<string,any> >selected_products = filter (map<string,any> p, products, { return p["status"]:nil == `selected; }); @@ -1335,6 +1334,7 @@ ret = Pkg::ResolvableInstall (p["name"]:"", `product) && ret; }); } + return ret; } Modified: trunk/packager/src/modules/SlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SlideShow.y… ============================================================================== --- trunk/packager/src/modules/SlideShow.ycp (original) +++ trunk/packager/src/modules/SlideShow.ycp Wed Apr 23 15:17:53 2008 @@ -1484,6 +1484,8 @@ `HSpacing( 0.5 ) ); + y2milestone("total_size_to_install: %1", total_size_to_install); + y2debug( "widget term: \n%1", widgets ); return widgets; } @@ -1749,6 +1751,7 @@ total_size_to_install = ListSum( flatten( total_sizes_per_cd_per_src ) ); + y2milestone("total_size_to_install: %1", total_size_to_install); remaining_sizes_per_cd_per_src = (list<list <integer> >) eval (total_sizes_per_cd_per_src); remaining_pkg_count_per_cd_per_src = (list<list <integer> >) eval (total_pkg_count_per_cd_per_src); total_cd_count = size( flatten( total_sizes_per_cd_per_src ) ); -- 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] r46984 - in /trunk/installation: package/yast2-installation.changes src/include/misc.ycp
by locilka＠svn.opensuse.org 23 Apr '08

23 Apr '08

Author: locilka Date: Wed Apr 23 15:09:11 2008 New Revision: 46984 URL: http://svn.opensuse.org/viewcvs/yast?rev=46984&view=rev Log: - Enabling inst_suseconfig in Automatic configuration (bnc #381751) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/include/misc.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Apr 23 15:09:11 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Apr 23 15:10:24 CEST 2008 - locilka(a)suse.cz + +- Enabling inst_suseconfig in Automatic configuration (bnc #381751) + +------------------------------------------------------------------- Tue Apr 22 18:46:51 CEST 2008 - locilka(a)suse.cz - Adjusting automatic configuration UI to use two progress bars Modified: trunk/installation/src/include/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/misc.yc… ============================================================================== --- trunk/installation/src/include/misc.ycp (original) +++ trunk/installation/src/include/misc.ycp Wed Apr 23 15:09:11 2008 @@ -212,6 +212,8 @@ if (ProductControl::GetUseAutomaticConfiguration()) { ProductControl::DisableAllModulesAndProposals ("installation", "continue"); ProductControl::EnableModule ("automatic_configuration"); + // Enable SuSEConfig, bnc #381751 + ProductControl::EnableModule ("suseconfig"); } else { ProductControl::UnDisableAllModulesAndProposals ("installation", "continue"); ProductControl::DisableModule ("automatic_configuration"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0