Hello community, here is the log from the commit of package yast2-tune checked in at Thu May 24 10:17:29 CEST 2007. -------- --- yast2-tune/yast2-tune.changes 2007-04-26 10:30:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-tune/yast2-tune.changes 2007-05-24 10:02:26.384700000 +0200 @@ -1,0 +2,6 @@ +Thu May 24 09:42:49 CEST 2007 - lslezak@suse.cz + +- added minimal command line mode support to 'hwinfo' (#269892) +- 2.15.6 + +------------------------------------------------------------------- Old: ---- yast2-tune-2.15.5.tar.bz2 New: ---- yast2-tune-2.15.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-tune.spec ++++++ --- /var/tmp/diff_new_pack.d29308/_old 2007-05-24 10:17:24.000000000 +0200 +++ /var/tmp/diff_new_pack.d29308/_new 2007-05-24 10:17:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-tune (Version 2.15.5) +# spec file for package yast2-tune (Version 2.15.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-tune -Version: 2.15.5 +Version: 2.15.6 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-tune-2.15.5.tar.bz2 +Source0: yast2-tune-2.15.6.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-testsuite # hwinfo/classnames.ycp @@ -34,7 +34,7 @@ %prep -%setup -n yast2-tune-2.15.5 +%setup -n yast2-tune-2.15.6 %build %{prefix}/bin/y2tool y2autoconf @@ -74,6 +74,9 @@ %doc %{prefix}/share/doc/packages/yast2-tune %changelog +* Thu May 24 2007 - lslezak@suse.cz +- added minimal command line mode support to 'hwinfo' (#269892) +- 2.15.6 * Thu Apr 26 2007 - lslezak@suse.cz - disable the IDE DMA module for now - libata doesn't support DMA mode changes (#264681) ++++++ yast2-tune-2.15.5.tar.bz2 -> yast2-tune-2.15.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.15.5/configure new/yast2-tune-2.15.6/configure --- old/yast2-tune-2.15.5/configure 2007-04-26 10:24:55.000000000 +0200 +++ new/yast2-tune-2.15.6/configure 2007-05-24 09:54:41.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-tune 2.15.5. +# Generated by GNU Autoconf 2.60 for yast2-tune 2.15.6. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-tune' PACKAGE_TARNAME='yast2-tune' -PACKAGE_VERSION='2.15.5' -PACKAGE_STRING='yast2-tune 2.15.5' +PACKAGE_VERSION='2.15.6' +PACKAGE_STRING='yast2-tune 2.15.6' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1183,7 +1183,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-tune 2.15.5 to adapt to many kinds of systems. +\`configure' configures yast2-tune 2.15.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1254,7 +1254,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-tune 2.15.5:";; + short | recursive ) echo "Configuration of yast2-tune 2.15.6:";; esac cat <<\_ACEOF @@ -1332,7 +1332,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-tune configure 2.15.5 +yast2-tune configure 2.15.6 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1346,7 +1346,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-tune $as_me 2.15.5, which was +It was created by yast2-tune $as_me 2.15.6, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2147,7 +2147,7 @@ # Define the identity of the package. PACKAGE='yast2-tune' - VERSION='2.15.5' + VERSION='2.15.6' cat >>confdefs.h <<_ACEOF @@ -2374,7 +2374,7 @@ -VERSION="2.15.5" +VERSION="2.15.6" RPMNAME="yast2-tune" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" @@ -3278,7 +3278,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-tune $as_me 2.15.5, which was +This file was extended by yast2-tune $as_me 2.15.6, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3321,7 +3321,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-tune config.status 2.15.5 +yast2-tune config.status 2.15.6 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.15.5/configure.in new/yast2-tune-2.15.6/configure.in --- old/yast2-tune-2.15.5/configure.in 2007-04-26 10:24:44.000000000 +0200 +++ new/yast2-tune-2.15.6/configure.in 2007-05-24 09:54:36.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-tune, 2.15.5, http://bugs.opensuse.org/, yast2-tune) +AC_INIT(yast2-tune, 2.15.6, http://bugs.opensuse.org/, yast2-tune) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.5" +VERSION="2.15.6" RPMNAME="yast2-tune" MAINTAINER="Ladislav Slezak <lslezak@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.15.5/hwinfo/src/hwinfo.ycp new/yast2-tune-2.15.6/hwinfo/src/hwinfo.ycp --- old/yast2-tune-2.15.5/hwinfo/src/hwinfo.ycp 2006-12-13 16:48:17.000000000 +0100 +++ new/yast2-tune-2.15.6/hwinfo/src/hwinfo.ycp 2007-05-24 09:53:08.000000000 +0200 @@ -6,7 +6,7 @@ * Ladislav Slezak <lslezak@suse.cz> * Michal Svec <msvec@suse.cz> * - * $Id: hwinfo.ycp 34944 2006-12-13 15:48:12Z lslezak $ + * $Id: hwinfo.ycp 38119 2007-05-24 07:53:08Z lslezak $ */ { @@ -16,6 +16,7 @@ import "Label"; import "Arch"; import "Directory"; +import "CommandLine"; //include "hwinfo/classnames.ycp"; include "hwinfo/routines.ycp"; @@ -39,26 +40,35 @@ ); } + /* * open progress bar window */ -UI::OpenDialog( - `HBox( - `VSpacing(7), - `VBox( - `HSpacing(40), - `HBox( - `HSquash (`MarginBox (0.5, 0.2, Icon("yast-hwinfo"))), - // translators: popup heading - `Left (`Heading(`id(`heading), _("Probing Hardware..."))) - ), - // progress bar label - `ProgressBar(`id(`initProg), _("Progress"), 1000, 0), - `VSpacing(0.5), - `PushButton(`id(`abort), `opt(`key_F9), Label::AbortButton()) +void OpenProbingPopup() +{ + UI::OpenDialog( + `HBox( + `VSpacing(7), + `VBox( + `HSpacing(40), + `HBox( + `HSquash (`MarginBox (0.5, 0.2, Icon("yast-hwinfo"))), + // translators: popup heading + `Left (`Heading(`id(`heading), _("Probing Hardware..."))) + ), + // progress bar label + `ProgressBar(`id(`initProg), _("Progress"), 1000, 0), + `VSpacing(0.5), + `PushButton(`id(`abort), `opt(`key_F9), Label::AbortButton()) + ) ) - ) -); + ); +} + +void CloseProbingPopup() +{ + UI::CloseDialog(); +} /* * these paths will be excluded from probing. @@ -67,27 +77,30 @@ */ list exclude_list = [.probe.byclass, .probe.bybus, .probe.ihw_data, .probe.system, .probe.status, .probe.cdb_isdn, .probe.boot_disk]; -if (Arch::is_uml()) -{ - // exclude more path in UML system, UML supports/emulates only few devices - exclude_list = union(exclude_list, [ .probe.scsi, .probe.camera, .probe.pppoe, .probe.isapnp, .probe.tape, .probe.joystick, - .probe.usb, .probe.ieee1394ctrl, .probe.usbctrl, .probe.cdrom, .probe.floppy, .probe.chipcard, .probe.mouse - ]); -} -/* - * if xserver is running, don't probe for mouse and chipcard - * because it has bad side effect (moving cursor) - */ -if (SCR::Execute(.target.bash, "/bin/ps -C X") == 0) +void InitProbeList() { - y2warning("X server is running - mouse and chipcard will not be probed"); - exclude_list = add(exclude_list, .probe.mouse); + if (Arch::is_uml()) + { + // exclude more path in UML system, UML supports/emulates only few devices + exclude_list = union(exclude_list, [ .probe.scsi, .probe.camera, .probe.pppoe, .probe.isapnp, .probe.tape, .probe.joystick, + .probe.usb, .probe.ieee1394ctrl, .probe.usbctrl, .probe.cdrom, .probe.floppy, .probe.chipcard, .probe.mouse + ]); + } - // .probe.chipcard has same effect as .probe.mouse - exclude_list = add(exclude_list, .probe.chipcard); -} + /* + * if xserver is running, don't probe for mouse and chipcard + * because it has bad side effect (moving cursor) + */ + if (SCR::Execute(.target.bash, "/bin/ps -C X") == 0) + { + y2warning("X server is running - mouse and chipcard will not be probed"); + exclude_list = add(exclude_list, .probe.mouse); + // .probe.chipcard has same effect as .probe.mouse + exclude_list = add(exclude_list, .probe.chipcard); + } +} /** * Add extra CPU info from .proc.cpuinfo to data read from .probe agent @@ -240,74 +253,84 @@ // Main -// tree item list -term items = nil; -// default initial path -path pat = .probe; -if (size(WFM::Args()) > 0) + +symbol StartGUI() { - // initial path overriden by module argument - pat = topath(WFM::Args(0)); -} + // display progress popup + OpenProbingPopup(); -// build the tree -items = buildHwTree(sformat("%1", pat), 0, 1000); + // set the paths to probe + InitProbeList(); -// interrupted -if (abortPressed) -{ - UI::CloseDialog(); - return `abort; -} + // tree item list + term items = nil; + // default initial path + path pat = .probe; -// title label -string title = _("&All Entries"); //this wasn't marked for translation in 8.0 -if(pat != .probe) -{ - title = trans_str(afterLast(sformat("%1", pat))); -} + // build the tree + items = buildHwTree(sformat("%1", pat), 0, 1000); -UI::CloseDialog(); + // close the popup + CloseProbingPopup(); -term con = `Tree(`id(`idTree), `opt(`vstretch, `hstretch), title, items[1]:nil); + // interrupted + if (abortPressed) + { + return `abort; + } -Wizard::CreateDialog(); -Wizard::SetDesktopIcon("hwinfo"); + // title label + string title = _("&All Entries"); + term con = `Tree(`id(`idTree), `opt(`vstretch, `hstretch), title, items[1]:nil); + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("hwinfo"); -Wizard::SetBackButton(`save, _("&Save to File...") ); -Wizard::SetNextButton(`next, Label::CloseButton() ); -// abort is not needed, module is read-only -Wizard::HideAbortButton(); + Wizard::SetBackButton(`save, _("&Save to File...") ); + Wizard::SetNextButton(`next, Label::CloseButton() ); + // abort is not needed, module is read-only + Wizard::HideAbortButton(); -// dialog header -Wizard::SetContents (_("Hardware Information"), con, -// help text - _("<P>The <B>Hardware Information</B> module displays the hardware -details of your computer. Click any node for more information.</p>\n") -+ _("<P>You can save hardware information to a file. Click <B>Save to File</B> and enter the filename.</P>"), -true, true); + // dialog header + Wizard::SetContents (_("Hardware Information"), con, -UI::SetFocus(`id(`idTree)); + // help text + _("<P>The <B>Hardware Information</B> module displays the hardware + details of your computer. Click any node for more information.</p>\n") + + _("<P>You can save hardware information to a file. Click <B>Save to File</B> and enter the filename.</P>"), + true, true); -any event = nil; + UI::SetFocus(`id(`idTree)); -// wait for finish -while(event != `abort && event !=`next && event != `cancel) -{ - event = UI::UserInput(); + any event = nil; - if (event == `save) + // wait for finish + while(event != `abort && event !=`next && event != `cancel) { - // store hwinfo output to the file - save_hwinfo_to_file("/"); + event = UI::UserInput(); + + if (event == `save) + { + // store hwinfo output to the file + save_hwinfo_to_file("/"); + } } + Wizard::CloseDialog(); + return `next; } -Wizard::CloseDialog(); -return `next; + +map cmdline_description = $[ + "id" : "hwinfo", + /* Command line help text for the hardware detection module, %1 is "hwinfo" */ + "help" : sformat(_("Hardware Detection - this module doesn't support command line interface, use '%1' instead."), "hwinfo"), + "guihandler": StartGUI, +]; + +return CommandLine::Run(cmdline_description); + /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.15.5/VERSION new/yast2-tune-2.15.6/VERSION --- old/yast2-tune-2.15.5/VERSION 2007-04-26 09:46:38.000000000 +0200 +++ new/yast2-tune-2.15.6/VERSION 2007-05-24 09:45:41.000000000 +0200 @@ -1 +1 @@ -2.15.5 +2.15.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de