December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60175 - in /branches/SuSE-Code-11-SP1-Branch/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsuchome Date: Tue Dec 22 14:37:28 2009 New Revision: 60175 URL: http://svn.opensuse.org/viewcvs/yast?rev=60175&view=rev Log: - added some path escaping - when generating new package descriptions, delete save entries of packages with same name (bnc#486041) - 2.17.14 Modified: branches/SuSE-Code-11-SP1-Branch/add-on-creator/VERSION branches/SuSE-Code-11-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-Code-11-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Modified: branches/SuSE-Code-11-SP1-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/add-o… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/add-on-creator/VERSION Tue Dec 22 14:37:28 2009 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: branches/SuSE-Code-11-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/add-o… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes Tue Dec 22 14:37:28 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Dec 22 14:16:06 CET 2009 - jsuchome(a)suse.cz + +- added some path escaping +- when generating new package descriptions, delete save entries of + packages with same name (bnc#486041) +- 2.17.14 + +------------------------------------------------------------------- Thu Nov 19 14:54:25 CET 2009 - jsuchome(a)suse.cz - backport changes done after SLE11 release: Modified: branches/SuSE-Code-11-SP1-Branch/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/add-o… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/add-on-creator/src/AddOnCreator.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Tue Dec 22 14:37:28 2009 @@ -1481,7 +1481,7 @@ string rpm_path = current_product["rpm_path"]:""; // 1. find the used architectures - string cmd = sformat ("cd %1; find -maxdepth 1 -type d", rpm_path); + string cmd = sformat ("cd '%1'; find -maxdepth 1 -type d", rpm_path); map out = $[]; if (rpm_path != "") out = (map) SCR::Execute (.target.bash_output, cmd); @@ -1505,14 +1505,14 @@ // 2. get the list of architectures from RPM's if (rpm_path != "") out = (map) SCR::Execute (.target.bash_output, - sformat ("find %1 -name '*.rpm'", rpm_path)); + sformat ("find '%1' -name '*.rpm'", rpm_path)); y2milestone ("asking the RPM's for ARCH and NAME..."); // for which architectures are the packages built map<string,any> package_architectures = $[]; foreach (string f, splitstring (out["stdout"]:"", "\n"), { if (f == "") return; out = (map) SCR::Execute (.target.bash_output, - sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\n%%|SOURCERPM?{bin}:{src}|\"",f)); + sformat ("rpm -q -p '%1' --qf \"%%{ARCH}\n%%{NAME}\n%%|SOURCERPM?{bin}:{src}|\"",f)); list lines = splitstring (out["stdout"]:"", "\n"); string arch = lines[0]:""; string name = lines[1]:""; @@ -1574,12 +1574,12 @@ if (required_rpm_path != "" && required_rpm_path != rpm_path) { out = (map) SCR::Execute (.target.bash_output, - sformat ("cd %1; find -name '*.rpm'", required_rpm_path)); + sformat ("cd '%1'; find -name '*.rpm'", required_rpm_path)); y2milestone ("asking the RPM's for NAME..."); list<string> inputs = create_argument_lists (out["stdout"]:""); string output = ""; foreach (string input, inputs, { - string cmd = sformat ("cd %1; rpm --qf \"%%{NAME}\n\" -qp %2", + string cmd = sformat ("cd '%1'; rpm --qf \"%%{NAME}\n\" -qp %2", required_rpm_path, input); out = (map) SCR::Execute (.target.bash_output, cmd); output = output + out["stdout"]:"" + "\n"; @@ -1718,6 +1718,7 @@ packages_descr[lang] = ReadPackagesFile (file); return; } + map package_names = mapmap (string p, map d, packages_descr[lang]:$[], ``($[ splitstring (p, " ")[0]:p : p])); // now, we need to merge old data from packages_descr with currently // generated ones (TODO this works only for packages.en) foreach (string p, map d, (map<string,map>) ReadPackagesFile (file), { @@ -1725,6 +1726,12 @@ { y2debug ("new package %1", d); packages_descr[lang,p] = d; + string name = splitstring (p, " ")[0]:p; + if (package_names[name]:"" != "") + { + y2milestone ("replacing saved '%1' with present '%2'", package_names[name]:"", p); + packages_descr[lang] = remove (packages_descr[lang]:$[], package_names[name]:""); + } } }); }); -- 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] r60174 - /trunk/printer/package/yast2-printer.changes
by jsmeix＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsmeix Date: Tue Dec 22 14:17:50 2009 New Revision: 60174 URL: http://svn.opensuse.org/viewcvs/yast?rev=60174&view=rev Log: Next version 2.19.2 with yast2-printer.changes entry: - Added percent encoding of URI values in the "Connection Wizard" (see Novell/Suse Bugzilla bnc#561626). - Added support to launch 'hp-setup' from the BasicAdd dialog to provide setup support for HP printers which require a proprietary plugin to be downloaded and installed and better setup support for HP network printers and HP all-in-one devices (HP's own tool 'hp-setup' implements special handling for special HP devices better than YaST). - 2.19.2 Modified: trunk/printer/package/yast2-printer.changes 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 Tue Dec 22 14:17:50 2009 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue Dec 22 14:11:37 CET 2009 - jsmeix(a)suse.de + +- Added percent encoding of URI values in the "Connection Wizard" + (see Novell/Suse Bugzilla bnc#561626). +- Added support to launch 'hp-setup' from the BasicAdd dialog + to provide setup support for HP printers which require + a proprietary plugin to be downloaded and installed + and better setup support for HP network printers and + HP all-in-one devices (HP's own tool 'hp-setup' implements + special handling for special HP devices better than YaST). +- 2.19.2 + +------------------------------------------------------------------- Wed Dec 9 12:51:58 CET 2009 - jsmeix(a)suse.de - An existing connection can be modified by the "Connection Wizard" -- 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] r60173 - /trunk/printer/tools/basicadd_displaytest.c
by jsmeix＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsmeix Date: Tue Dec 22 14:07:59 2009 New Revision: 60173 URL: http://svn.opensuse.org/viewcvs/yast?rev=60173&view=rev Log: Missed 'svn add tools/basicadd_displaytest.c' Done now. Added: trunk/printer/tools/basicadd_displaytest.c Added: trunk/printer/tools/basicadd_displaytest.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/basicadd_displayte… ============================================================================== --- trunk/printer/tools/basicadd_displaytest.c (added) +++ trunk/printer/tools/basicadd_displaytest.c Tue Dec 22 14:07:59 2009 @@ -0,0 +1,22 @@ +/* + * gcc -Wall -o basicadd_displaytest basicadd_displaytest.c -L/usr/X11R6/lib -lX11 + */ + +#include <stdio.h> +#include <stdlib.h> +#include <X11/Xlib.h> + +int main (void) +{ char *display_name; + Display *display; + + display_name=getenv( "DISPLAY" ); + display = XOpenDisplay( display_name ); + if( NULL == display ) + { fprintf( stderr, "Unable to open Display: %s\n", display_name ); + exit( 1 ); + } + XCloseDisplay( display ); + return 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] r60172 - in /trunk/printer: configure.in.in src/Printer.ycp src/basicadd.ycp src/helps.ycp src/wizards.ycp tools/Makefile.am yast2-printer.spec.in
by jsmeix＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsmeix Date: Tue Dec 22 14:06:29 2009 New Revision: 60172 URL: http://svn.opensuse.org/viewcvs/yast?rev=60172&view=rev Log: The new function RunHpsetup() together with the test tool basicadd_displaytest.c implements to launch HPLIP's printer setup tool 'hp-setup' from the BasicAdd dialog which provides much better support for HP network printers and HP all-in-one devices. Modified: trunk/printer/configure.in.in trunk/printer/src/Printer.ycp trunk/printer/src/basicadd.ycp trunk/printer/src/helps.ycp trunk/printer/src/wizards.ycp trunk/printer/tools/Makefile.am trunk/printer/yast2-printer.spec.in Modified: trunk/printer/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/configure.in.in?rev=6017… ============================================================================== --- trunk/printer/configure.in.in (original) +++ trunk/printer/configure.in.in Tue Dec 22 14:06:29 2009 @@ -4,6 +4,13 @@ @YAST2-INIT-COMMON@ @YAST2-INIT-YCP@ +# tools/basicadd_displaytest needs /usr/include/X11/Xlib.h and /usr/lib/libX11.so -> xorg-x11-libX11-devel RPM +yast_found_libX11=no +AC_CHECK_HEADER(X11/Xlib.h,[yast_found_libX11=yes]) +if [[ "$yast_found_libX11" = "no" ]] +then AC_MSG_ERROR(Header file X11/Xlib.h missing. Usually the xorg-x11-libX11-devel RPM is missing.) +fi + ## some common checks @YAST2-CHECKS-COMMON@ @YAST2-CHECKS-YCP@ Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=6017… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Tue Dec 22 14:06:29 2009 @@ -2173,6 +2173,83 @@ } /** + * Run hp-setup: + * @return false if hp-setup cannot be run and return true in any other case + * because there is no usable exit code of hp-setup (always zero even in case of error). + */ +global boolean RunHpsetup() +{ // First of all the multi-line strings because such strings cannot be indented: + string basicadd_displaytest_failed_message = + // Message of a Popup::Error when hp-setup should be run. + // Do not change or translate "hp-setup", it is a program name. + // Do not change or translate "DISPLAY", it is an environment variable name. +_("Cannot run hp-setup because no graphical display can be opened. +This happens in particular when YaST runs in text-only mode, +or when the user who runs YaST has no DISPLAY environment variable set, +or when the YaST process is not allowed to access the graphical display. +In this case you should run hp-setup manually directly as user 'root'. +"); + string hpsetup_not_executable_message = + // Message of a Popup::Error when hp-setup should be run. + // Do not change or translate "hp-setup", it is a program name: +_("Cannot run hp-setup because +/usr/bin/hp-setup is not executable +or does not exist. +"); + string hpsetup_busy_message = + // Body of a Popup::ShowFeedback. + // Do not change or translate "hp-setup", it is a program name: +_("Launched hp-setup. +You must finish hp-setup before you can proceed with the printer configuration. +"); + if( ! Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "basicadd_displaytest" ) ) + { // In particular when YaST runs in text-only mode, hp-setup must not be launched + // because it would run without any contact to the user "in the background" + // while in the foreground YaST waits for hp-setup to be finished + // which is imposible for the user so that the result is a deadlock. + // All the user could do is to kill the hp-setup process. + // It does not matter if basicadd_displaytest fails orderly because XOpenDisplay fails + // or if it crashes because of missing libX11.so on a minimal installation without X + // because any non-zero exit code indicates that no graphical window can be opened. + y2milestone( "RunHpsetup failed: %1basicadd_displaytest failed.", Printerlib::yast_bin_dir ); + Popup::Error( basicadd_displaytest_failed_message ); + return false; + } + if( ! Printerlib::TestAndInstallPackage( "hplip", "installed" ) ) + { y2milestone( "RunHpsetup failed: hplip not installed." ); + // Only a notification but no installation of HPLIP here. + // Installing the package hplip can pull in tons of required packages + // because the hplip package does not only provide the 'hp' backend but is a + // full featured multifunction solution with GUI for HP printers and all-in-one devices. + // HPLIP supports printing, scanning, faxing, photo card access, and device management. + // Additionally installing hplip can become very complicated (see driveradd.ycp). + // Therefore the RunHpsetup function is not bloated with installing HPLIP. + { Popup::Error( // Popup:::Error when the user had selected to run hp-setup + // from the BasicAdd dialog but the RPM package hplip is not installed: + // Do not change or translate "hp-setup", it is a program name. + // Do not change or translate "hplip", it is a package name. + // Translate 'Add Driver' the same as the PushButton name to go to the "Add Driver" dialog: + _("To run hp-setup, the RPM package hplip must be installed.\nUse 'Add Driver' to install it.") + ); + } + return false; + } + if( ! Printerlib::ExecuteBashCommand( "test -x /usr/bin/hp-setup" ) ) + { y2milestone( "RunHpsetup failed: /usr/bin/hp-setup not executable or does not exist." ); + Popup::Error( hpsetup_not_executable_message ); + return false; + } + Popup::ShowFeedback( // No title for a simple busy message: + "", + // Busy message: + hpsetup_busy_message + ); + Printerlib::ExecuteBashCommand( "/usr/bin/hp-setup" ); + Popup::ClearFeedback(); + return true; +} + +/** * Get all printer settings from the first parameter * (For use by autoinstallation.) * @param settings The YCP structure to be imported. Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=601… ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Tue Dec 22 14:06:29 2009 @@ -203,13 +203,35 @@ ), `VStretch(), `Left - ( `ReplacePoint - ( `id(`queue_name_input_replace_point), - `InputField - ( `id(`queue_name_input), - // Header of a TextEntry to enter the queue name: - _("Set &Name"), - queue_name_proposal + ( `HBox + ( `ReplacePoint + ( `id(`queue_name_input_replace_point), + `InputField + ( `id(`queue_name_input), + // Avoid that it becomes squeezed to only a few characters in text mode: + `opt(`hstretch), + // Header of a TextEntry to enter the queue name: + _("Set &Name"), + queue_name_proposal + ) + ), + `HStretch(), + `VBox + ( `Right + ( `Label + ( // Label text to run HPLIP's printer setup tool 'hp-setup' + // to set up HP printers which runs only in English language: + _("Alternative setup for HP printers (English only):") + ) + ), + `Right + ( `PushButton + ( `id(`run_hpsetup), + // Label of a PushButton to run HPLIP's printer setup tool 'hp-setup'. + // Do not change or translate "hp-setup", it is a program name: + _("Run &hp-setup") + ) + ) ) ) ) @@ -243,11 +265,11 @@ UI::ChangeWidget( `connection_selection, `CurrentItem, `id(Printer::selected_connections_index) ); } UI::FakeUserInput( `connection_selection ); - any ret = nil; + any user_input = nil; while(true) - { ret = UI::UserInput(); - if( ret == `abort || ret == `cancel || ret == `back ) break; - if( ret == `next ) + { user_input = UI::UserInput(); + if( `abort == user_input || `cancel == user_input || `back == user_input ) break; + if( `next == user_input ) { if( Printer::selected_connections_index < 0 && Printer::selected_ppds_index < 0 ) @@ -341,15 +363,15 @@ // Exit this dialog in any case: break; } - if( ret == `connection_wizard ) + if( `connection_wizard == user_input ) { // Exit this dialog and go to the ConnectionWizardDialog via the sequencer in wizards.ycp: break; } - if( ret == `add_driver ) + if( `add_driver == user_input ) { // Exit this dialog and go to the AddDriverDialog via the sequencer in wizards.ycp: break; } - if( ret == `more_connections ) + if( `more_connections == user_input ) { UI::ReplaceWidget( `id(`connection_selection_replace_point), `Table( `id(`connection_selection), // By default there is no UserInput() @@ -385,7 +407,7 @@ UI::FakeUserInput( `connection_selection ); continue; } - if( ret == `connection_selection ) + if( `connection_selection == user_input ) { integer selected_connection_index = (integer)UI::QueryWidget( `id(`connection_selection), `CurrentItem ); if( nil == selected_connection_index ) { Popup::AnyMessage( // Header of a Popup::AnyMessage when no connection was selected: @@ -444,6 +466,8 @@ UI::ReplaceWidget( `id(`queue_name_input_replace_point), `InputField ( `id(`queue_name_input), + // Avoid that it becomes squeezed to only a few characters in text mode: + `opt(`hstretch), // Header of a TextEntry to enter the queue name: _("Set &Name"), queue_name_proposal @@ -451,7 +475,7 @@ ); continue; } - if( ret == `driver_selection ) + if( `driver_selection == user_input ) { integer selected_ppd_index = (integer)UI::QueryWidget( `id(`driver_selection), `CurrentItem ); if( nil == selected_ppd_index ) { Popup::AnyMessage( // Header of a Popup::AnyMessage when no driver was selected: @@ -467,7 +491,7 @@ } continue; } - if( ret == `apply_driver_filter ) + if( `apply_driver_filter == user_input ) { driver_filter_input_text = (string)UI::QueryWidget( `id(`driver_filter_input), `Value ); y2milestone( "Drivers for '%1'", driver_filter_input_text ); driver_filter_string = Printer::DeriveDriverFilterString( driver_filter_input_text ); @@ -495,7 +519,7 @@ ); continue; } - if( ret == `more_drivers ) + if( `more_drivers == user_input ) { if( non_matching_fallback_driver_filter_string != driver_filter_string ) { driver_filter_string = ""; } @@ -619,11 +643,31 @@ ); continue; } - y2milestone( "Ignoring unexpected returncode in BasicAddDialog: %1", ret ); + if( `run_hpsetup == user_input ) + { // Run hp-setup and wait until it is finished, then go back directly to the Overview dialog. + // Printer::RunHpsetup() returns false only if hp-setup cannot be run. + // It returns true in any other case because there is no usable exit code of hp-setup + // (always zero even in case of error). + // The hp-setup exit code does not matter because the printer autodetection in the Overview dialog + // will show an appropriate result (e.g. no new print queue if hp-setup failed): + if( ! Printer::RunHpsetup() ) + { Popup::Error( // Message of a Popup::Error. + // Only a simple message because before the RunHpsetup function was called + // and this function would have shown more specific messages. + // Do not change or translate "hp-setup", it is a program name: + _("Failed to run hp-setup.") + ); + continue; + } + // Exit this dialog and run go back to the Overview dialog via the sequencer in wizards.ycp + // to show the new printer autodetection results: + break; + } + y2milestone( "Ignoring unexpected returncode in BasicAddDialog: %1", user_input ); continue; } y2milestone( "leaving BasicAddDialog" ); - return ret; + return user_input; } /* EOF */ Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=60172&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Tue Dec 22 14:06:29 2009 @@ -451,26 +451,26 @@ Input fields which require percent-encoded input are denoted by a '[percent-encoded]' hint. Listing of characters and their percent encoding: -space ' ' -> %20 -exclamation mark ! -> %21 -number sign # -> %23 -Dollar sign $ -> %24 -percentage % -> %25 -ampersand & -> %26 -apostrophe / single quotation mark ' -> %27 -left parenthesis ( -> %28 -right parenthesis ) -> %29 -asterisk * -> %2A -plus sign + -> %2B -comma , -> %2C -slash / -> %2F -colon : -> %3A -semicolon ; -> %3B -equals sign = -> %3D -question mark ? -> %3F -at sign @ -> %40 -left bracket [ -> %5B -right bracket ] -> %5D +space ' ' is percent encoded as %20 +exclamation mark ! is percent encoded as %21 +number sign # is percent encoded as %23 +Dollar sign $ is percent encoded as %24 +percentage % is percent encoded as %25 +ampersand & is percent encoded as %26 +apostrophe / single quotation mark ' is percent encoded as %27 +left parenthesis ( is percent encoded as %28 +right parenthesis ) is percent encoded as %29 +asterisk * is percent encoded as %2A +plus sign + is percent encoded as %2B +comma , is percent encoded as %2C +slash / is percent encoded as %2F +colon : is percent encoded as %3A +semicolon ; is percent encoded as %3B +equals sign = is percent encoded as %3D +question mark ? is percent encoded as %3F +at sign @ is percent encoded as %40 +left bracket [ is percent encoded as %5B +right bracket ] is percent encoded as %5D For details see 'Uniform Resource Identifier (URI): Generic Syntax' at http://tools.ietf.org/html/rfc3986 ") + @@ -481,7 +481,7 @@ are autodetected and the appropriate device URI is autogenerated. For example: parallel:/dev/lp0 -usb://ACME/FunPrinter +usb://ACME/Fun%20Printer?serial=A1B2C3 hp:/usb/HP_LaserJet?serial=1234 Usually only the autogenerated device URIs work. When the device is not autodetected, there is usually no communication Modified: trunk/printer/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/wizards.ycp?rev=6017… ============================================================================== --- trunk/printer/src/wizards.ycp (original) +++ trunk/printer/src/wizards.ycp Tue Dec 22 14:06:29 2009 @@ -79,7 +79,8 @@ `back : "overview", `next : "overview", `connection_wizard : "add_connection_wizard", - `add_driver : "add_driver_add" + `add_driver : "add_driver_add", + `run_hpsetup : "overview" ], "add_connection_wizard" : $[ `abort : `abort, `back : "add", Modified: trunk/printer/tools/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/tools/Makefile.am?rev=60… ============================================================================== --- trunk/printer/tools/Makefile.am (original) +++ trunk/printer/tools/Makefile.am Tue Dec 22 14:06:29 2009 @@ -15,3 +15,8 @@ test_remote_socket EXTRA_DIST = $(ybin_SCRIPTS) + +ybin_PROGRAMS = basicadd_displaytest +basicadd_displaytest_SOURCES = basicadd_displaytest.c +basicadd_displaytest_LDADD = -lX11 + 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 Tue Dec 22 14:06:29 2009 @@ -2,18 +2,22 @@ @HEADER@ -BuildRequires: cups-devel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite +BuildRequires: update-desktop-files xorg-x11-libX11-devel yast2 yast2-core-devel yast2-devtools yast2-testsuite -Recommends: netcat +Recommends: cups-client netcat samba-client -Requires: /usr/bin/host cups-libs +Requires: /bin/mktemp /bin/ping /usr/bin/sed Requires: yast2 >= 2.16.12 -Provides: yast2-config-cups yast2-agent-printerdb yast2-agent-cups yast2-lib-printer yast2-config-printer y2c_cups y2c_prnt y2l_printer y2a_cups y2a_printerdb yast2-trans-printer yast2-trans-libprinter yast2-trans-printerdb yast2-trans-cups yast2-printerdb-devel yast2-cups-devel -Obsoletes: yast2-config-cups yast2-agent-printerdb yast2-agent-cups yast2-lib-printer yast2-config-printer y2c_cups y2c_prnt y2l_printer y2a_cups y2a_printerdb yast2-trans-printer yast2-trans-libprinter yast2-trans-printerdb yast2-trans-cups yast2-printerdb-devel yast2-cups-devel +Provides: yast2-config-cups yast2-agent-cups yast2-lib-printer yast2-config-printer y2c_cups y2c_prnt y2l_printer y2a_cups yast2-trans-printer yast2-trans-libprinter yast2-trans-cups yast2-cups-devel +Obsoletes: yast2-config-cups yast2-agent-cups yast2-lib-printer yast2-config-printer y2c_cups y2c_prnt y2l_printer y2a_cups yast2-trans-printer yast2-trans-libprinter yast2-trans-cups yast2-cups-devel -Provides: yast2-agent-cups-devel yast2-agent-printerdb-devel y2d_prnt y2t_prnt yast2-db-printer yast2-printerdb -Obsoletes: yast2-agent-cups-devel yast2-agent-printerdb-devel y2d_prnt y2t_prnt yast2-db-printer yast2-printerdb +Provides: yast2-agent-cups-devel y2d_prnt y2t_prnt +Obsoletes: yast2-agent-cups-devel y2d_prnt y2t_prnt + +# Used to exclude libX11, libXau, libxcb, and libxcb-xlib from the requires list +# which are pulled in by Autoreqprov because of the basicadd_displaytest tool: +%define my_requires /tmp/my-requires Summary: YaST2 - Printer Configuration @@ -33,6 +37,13 @@ @BUILD@ @INSTALL@ +# Exclude libX11, libXau, libxcb, and libxcb-xlib from the requires list +# which are pulled in by Autoreqprov because of the basicadd_displaytest tool: +cat << EOF > %{my_requires} +grep -v 'basicadd_displaytest' | %{__find_requires} +EOF +chmod 755 %{my_requires} +%define __find_requires %{my_requires} %post @@ -61,6 +72,7 @@ @ybindir@/test_remote_novell @ybindir@/test_remote_smb @ybindir@/test_remote_socket +@ybindir@/basicadd_displaytest #Documentation %dir @docdir@ @docdir@/COPYING -- 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] r60171 - /tags/stable-2_19_0/firstboot/
by jsuchome＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsuchome Date: Tue Dec 22 13:27:35 2009 New Revision: 60171 URL: http://svn.opensuse.org/viewcvs/yast?rev=60171&view=rev Log: Created tag stable-2_19_0 for firstboot Added: tags/stable-2_19_0/firstboot/ - copied from r60170, trunk/firstboot/ -- 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] r60170 - /tags/branch-Code-11-SP1-2_17_11/firstboot/
by jsuchome＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsuchome Date: Tue Dec 22 13:27:32 2009 New Revision: 60170 URL: http://svn.opensuse.org/viewcvs/yast?rev=60170&view=rev Log: Created tag branch-Code-11-SP1-2_17_11 for firstboot Added: tags/branch-Code-11-SP1-2_17_11/firstboot/ (props changed) - copied from r60169, branches/SuSE-Code-11-SP1-Branch/firstboot/ -- 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] r60169 - in /trunk/firstboot: VERSION package/yast2-firstboot.changes src/firstboot_keyboard.ycp
by jsuchome＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsuchome Date: Tue Dec 22 13:27:28 2009 New Revision: 60169 URL: http://svn.opensuse.org/viewcvs/yast?rev=60169&view=rev Log: - handle arguments from control file (bnc#566669) - 2.19.0 Modified: trunk/firstboot/VERSION trunk/firstboot/package/yast2-firstboot.changes trunk/firstboot/src/firstboot_keyboard.ycp Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=60169&r1=6… ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Tue Dec 22 13:27:28 2009 @@ -1 +1 @@ -2.18.10 +2.19.0 Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Tue Dec 22 13:27:28 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Dec 22 13:04:01 CET 2009 - jsuchome(a)suse.cz + +- handle arguments from control file (bnc#566669) +- 2.19.0 + +------------------------------------------------------------------- Tue Oct 27 13:32:11 CET 2009 - jsuchome(a)suse.cz - package firstboot_language_keyboard.ycp file (fate#306296) Modified: trunk/firstboot/src/firstboot_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/src/firstboot_keyboard… ============================================================================== --- trunk/firstboot/src/firstboot_keyboard.ycp (original) +++ trunk/firstboot/src/firstboot_keyboard.ycp Tue Dec 22 13:27:28 2009 @@ -9,6 +9,7 @@ textdomain "country"; import "Arch"; + import "GetInstArgs"; import "Directory"; import "Keyboard"; import "Firstboot"; @@ -21,7 +22,7 @@ Keyboard::Read (); - ret = KeyboardDialog ($[]); + ret = KeyboardDialog (GetInstArgs::argmap()); if (ret == `next) { -- 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] r60168 - in /branches/SuSE-Code-11-SP1-Branch/firstboot: VERSION package/yast2-firstboot.changes src/firstboot_keyboard.ycp
by jsuchome＠svn.opensuse.org 22 Dec '09

22 Dec '09

Author: jsuchome Date: Tue Dec 22 13:27:15 2009 New Revision: 60168 URL: http://svn.opensuse.org/viewcvs/yast?rev=60168&view=rev Log: - handle arguments from control file (bnc#566669) - 2.17.11 Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_keyboard.ycp Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/VERSION Tue Dec 22 13:27:15 2009 @@ -1 +1 @@ -2.17.10 +2.17.11 Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/package/yast2-firstboot.changes Tue Dec 22 13:27:15 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Dec 22 13:04:44 CET 2009 - jsuchome(a)suse.cz + +- handle arguments from control file (bnc#566669) +- 2.17.11 + +------------------------------------------------------------------- Tue Oct 27 13:22:14 CET 2009 - jsuchome(a)suse.cz - added step for both language and keyboard layout (fate#306296) Modified: branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/first… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_keyboard.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/firstboot/src/firstboot_keyboard.ycp Tue Dec 22 13:27:15 2009 @@ -9,6 +9,7 @@ textdomain "country"; import "Arch"; + import "GetInstArgs"; import "Directory"; import "Keyboard"; import "Firstboot"; @@ -21,7 +22,7 @@ Keyboard::Read (); - ret = KeyboardDialog ($[]); + ret = KeyboardDialog (GetInstArgs::argmap()); if (ret == `next) { -- 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] <rest-service> master : code cleanup
by Stefan Schubert 22 Dec '09

22 Dec '09

ref: refs/heads/master commit 31f399a35839d17d62005b9623562d53af7a6092 Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Dec 22 12:02:12 2009 +0100 code cleanup --- .../status/app/controllers/metrics_controller.rb | 36 ++++++------------- 1 files changed, 12 insertions(+), 24 deletions(-) diff --git a/plugins/status/app/controllers/metrics_controller.rb b/plugins/status/app/controllers/metrics_controller.rb index d39205f..719b6ee 100644 --- a/plugins/status/app/controllers/metrics_controller.rb +++ b/plugins/status/app/controllers/metrics_controller.rb @@ -58,20 +58,10 @@ class MetricsController < ApplicationController end limits = Hash.new limits = create_limit(params["status"]) - f = File.open(File.join(plugin_config_dir, "status_limits.yaml"), "w") + f = File.open(File.join(plugin_config_dir, "status_configuration.yaml"), "w") f.write(limits.to_yaml) f.close - - @status = Status.new - # use now if time is not valid - begin - stop = params[:stop].blank? ? Time.now : Time.at(params[:stop].to_i) - start = params[:start].blank? ? stop - 300 : Time.at(params[:start].to_i) - @status.collect_data(start, stop, params[:data]) - render :show - rescue Exception => e - render :text => e.to_s, :status => 400 # bad request - end + render :text => "OK" end # GET /status @@ -88,12 +78,13 @@ class MetricsController < ApplicationController end end - @metrics = Metric.find(:all, conditions) - - respond_to do |format| - format.xml { render :xml => @metrics.to_xml(:root => 'metrics', :data => false) } - end + @metric = Metric.find(:all, conditions) + @data = false + @start = nil + @stop = nil + + render :show end # GET /status/1 @@ -102,14 +93,11 @@ class MetricsController < ApplicationController #permission_check("org.opensuse.yast.system.status.read") begin @metric = Metric.find(params[:id]) - stop = params[:stop].blank? ? Time.now : Time.at(params[:stop].to_i) - start = params[:start].blank? ? stop - 300 : Time.at(params[:start].to_i) - - respond_to do |format| - format.xml { render :xml => @metric.to_xml(:start => start, :stop => stop) } - end + @stop = params[:stop].blank? ? Time.now : Time.at(params[:stop].to_i) + @start = params[:start].blank? ? @stop - 300 : Time.at(params[:start].to_i) + @data = true rescue Exception => e - render :text => e.to_s, :status => 400 # bad request + render ErrorResult.error(400, 108, e.to_s) and return end end end -- 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] <rest-service> master : cleanup code; bring metrix to the level of status
by Stefan Schubert 22 Dec '09

22 Dec '09

ref: refs/heads/master commit 4e4d3e055a49b1cf76c2082873b9674b2d8f13eb Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Dec 22 11:03:14 2009 +0100 cleanup code; bring metrix to the level of status --- .../status/app/controllers/metrics_controller.rb | 1 - plugins/status/app/models/metric.rb | 57 +++++++++++++++++++- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/plugins/status/app/controllers/metrics_controller.rb b/plugins/status/app/controllers/metrics_controller.rb index c699898..d39205f 100644 --- a/plugins/status/app/controllers/metrics_controller.rb +++ b/plugins/status/app/controllers/metrics_controller.rb @@ -1,6 +1,5 @@ include ApplicationHelper -require 'scr' require 'metric' require 'uri' diff --git a/plugins/status/app/models/metric.rb b/plugins/status/app/models/metric.rb index f3e0919..ef8ec02 100644 --- a/plugins/status/app/models/metric.rb +++ b/plugins/status/app/models/metric.rb @@ -5,7 +5,26 @@ # @author Duncan Mac-Vicar P. <dmacvicar(a)suse.de> # @author Stefan Schubert <schubi(a)suse.de> # -require 'yaml' +require 'exceptions' + +class CollectdOutOfSyncError < BackendException + def initialize(timestamp) + @timestamp = timestamp + super("Collectd is out of sync.") + end + + def to_xml + xml = Builder::XmlMarkup.new({}) + xml.instruct! + + xml.error do + xml.type "COLLECTD_SYNC_ERROR" + xml.description "Collectd is out of sync. Status information can be expected at #{Time.at((a)timestamp.to_i).ctime}." + + xml.timestamp @timestamp + end + end +end # # This class acts as a model for metrics provided by collectd @@ -30,6 +49,7 @@ require 'yaml' # end # class Metric + require 'yaml' COLLECTD_BASE = "/var/lib/collectd" @@ -41,6 +61,7 @@ class Metric # convenience, plugin and instance attr_reader :plugin_full attr_reader :type_full + attr_reader :config # like identifier, but to be used as a REST id # so / are replaced by + @@ -123,6 +144,18 @@ class Metric # these values can be extracted from the file but we cache # them @host, @plugin, @plugin_instance, @type, @type_instance = Metric.parse_file_path(path) + + #find the correct plugin path for the config file + plugin_config_dir = "#{RAILS_ROOT}/config" #default + Rails.configuration.plugin_paths.each do |plugin_path| + if File.directory?(File.join(plugin_path, "status")) + plugin_config_dir = plugin_path+"/status/config" + Dir.mkdir(plugin_config_dir) unless File.directory?(plugin_config_dir) + break + end + end + #reading configuration file + @conf = YAML.load(File.open(File.join(plugin_config_dir, "status_configuration.yaml"))) if File.exists?(File.join(plugin_config_dir, "status_configuration.yaml")) end # parses the host, plugin, plugin_instance, type and type_instance @@ -226,6 +259,13 @@ class Metric xml.type type xml.type_instance type_instance + if @conf and @conf.has_key?(id) + xml.limits() do + xml.max(@conf["#{id}"]["max"]) + xml.min(@conf["#{id}"]["min"]) + end + end + # serialize data unless it is disabled unless opts.has_key?(:data) and !opts[:data] metric_data = data(data_opts) @@ -242,6 +282,12 @@ class Metric end end + + #get last entry of rrd database + def self.last_db_entry(file) + `/bin/sh -c "LC_ALL=C rrdtool last #{file}"` + end + # runs the rddtool on file with start time and end time # @@ -250,6 +296,15 @@ class Metric # # default last 5 minutes from now def self.run_rrdtool(file, opts={}) + + #checking if collectd is running + ServiceNotRunning.new('collectd') unless collectd_running? + + #checking if systemtime is BEHIND the last entry of collectd. + #If yes, no data will be available. + timestamp = last_db_entry(file) + raise CollectdOutOfSyncError.new(timestamp) if Time.now < Time.at(timestamp.to_i) + stop = opts.has_key?(:stop) ? opts[:stop] : Time.now start = opts.has_key?(:start) ? opts[:start] : stop - 300 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0