Hello community,
here is the log from the commit of package yast2
checked in at Mon Apr 14 01:36:23 CEST 2008.
--------
--- yast2/yast2.changes 2008-04-10 15:16:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-04-13 14:51:42.846562000 +0200
@@ -1,0 +2,17 @@
+Sun Apr 13 14:42:01 CEST 2008 - aschnell@suse.de
+
+- refactoring and fixing LogView.ycp (bnc #371983)
+- 2.16.49
+
+-------------------------------------------------------------------
+Fri Apr 11 18:38:02 CEST 2008 - locilka@suse.cz
+
+- New Wizard::OpenOKDialog() (FATE #120373).
+
+-------------------------------------------------------------------
+Fri Apr 11 10:50:20 CEST 2008 - mvidner@suse.cz
+
+- FileChanges::FileChangedFromPackage: fixed to actually consider the
+ file parameter
+
+-------------------------------------------------------------------
@@ -5 +22 @@
- and domain name (for FaTE #302863)
+ and domain name (for FaTE #302863)
@@ -11 +28 @@
-- Progress.ycp: use UI::GetDisplay info only when it is really
+- Progress.ycp: use UI::GetDisplay info only when it is really
@@ -66 +83 @@
-- 2.16.43
+- 2.16.43
Old:
----
yast2-2.16.48.tar.bz2
New:
----
yast2-2.16.49.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.yq3046/_old 2008-04-14 01:36:03.000000000 +0200
+++ /var/tmp/diff_new_pack.yq3046/_new 2008-04-14 01:36:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.16.48)
+# spec file for package yast2 (Version 2.16.49)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2
-Version: 2.16.48
+Version: 2.16.49
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.16.48.tar.bz2
+Source0: yast2-2.16.49.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
@@ -25,8 +25,8 @@
BuildRequires: yast2-pkg-bindings >= 2.16.23
# pre-requires for filling the sysconfig template (sysconfig.yast2)
PreReq: %fillup_prereq
-# ag_process
-Requires: yast2-core >= 2.16.37
+# ag_process, sublist
+Requires: yast2-core >= 2.16.46
# Mod_UI
Requires: yast2-ycp-ui-bindings >= 2.16.37
# changed callback registration
@@ -136,7 +136,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.16.48
+%setup -n yast2-2.16.49
%build
%{prefix}/bin/y2tool y2autoconf
@@ -240,6 +240,14 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Sun Apr 13 2008 aschnell@suse.de
+- refactoring and fixing LogView.ycp (bnc #371983)
+- 2.16.49
+* Fri Apr 11 2008 locilka@suse.cz
+- New Wizard::OpenOKDialog() (FATE #120373).
+* Fri Apr 11 2008 mvidner@suse.cz
+- FileChanges::FileChangedFromPackage: fixed to actually consider the
+ file parameter
* Thu Apr 10 2008 kmachalkova@suse.cz
- Hostname.ycp: new functions for retrieving current FQDN, hostname
and domain name (for FaTE #302863)
++++++ yast2-2.16.48.tar.bz2 -> yast2-2.16.49.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.48/configure new/yast2-2.16.49/configure
--- old/yast2-2.16.48/configure 2008-04-10 15:10:08.000000000 +0200
+++ new/yast2-2.16.49/configure 2008-04-13 14:51:14.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2 2.16.48.
+# Generated by GNU Autoconf 2.61 for yast2 2.16.49.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.16.48'
-PACKAGE_STRING='yast2 2.16.48'
+PACKAGE_VERSION='2.16.49'
+PACKAGE_STRING='yast2 2.16.49'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1199,7 +1199,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 2.16.48 to adapt to many kinds of systems.
+\`configure' configures yast2 2.16.49 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1270,7 +1270,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.16.48:";;
+ short | recursive ) echo "Configuration of yast2 2.16.49:";;
esac
cat <<\_ACEOF
@@ -1348,7 +1348,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.16.48
+yast2 configure 2.16.49
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1362,7 +1362,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 $as_me 2.16.48, which was
+It was created by yast2 $as_me 2.16.49, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2183,7 +2183,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.16.48'
+ VERSION='2.16.49'
cat >>confdefs.h <<_ACEOF
@@ -2410,7 +2410,8 @@
-VERSION="2.16.48"
+
+VERSION="2.16.49"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -2662,8 +2663,8 @@
if test -z "$XGETTEXT" ; then
- { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-devel." >&5
-echo "$as_me: error: xgettext is missing; please install gettext-devel." >&2;}
+ { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-tools." >&5
+echo "$as_me: error: xgettext is missing; please install gettext-tools." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -3411,7 +3412,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2 $as_me 2.16.48, which was
+This file was extended by yast2 $as_me 2.16.49, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3454,7 +3455,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.16.48
+yast2 config.status 2.16.49
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.48/configure.in new/yast2-2.16.49/configure.in
--- old/yast2-2.16.48/configure.in 2008-04-10 15:10:03.000000000 +0200
+++ new/yast2-2.16.49/configure.in 2008-04-13 14:51:10.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.16.48, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.16.49, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -14,10 +14,11 @@
AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
+dnl long filenames; we use GNU Make extensions and that's ok
+AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.48"
+VERSION="2.16.49"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -117,7 +118,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.48/COPYRIGHT.english new/yast2-2.16.49/COPYRIGHT.english
--- old/yast2-2.16.48/COPYRIGHT.english 2008-04-10 15:14:43.000000000 +0200
+++ new/yast2-2.16.49/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.48/library/log/src/LogViewCore.ycp new/yast2-2.16.49/library/log/src/LogViewCore.ycp
--- old/yast2-2.16.48/library/log/src/LogViewCore.ycp 2008-04-10 13:54:48.000000000 +0200
+++ new/yast2-2.16.49/library/log/src/LogViewCore.ycp 2008-04-13 14:45:14.000000000 +0200
@@ -28,7 +28,11 @@
/**
- * data describing log: file, max_lines etc.
+ * data describing log:
+ * file: filename to read from
+ * grep: grep file with expression
+ * command: command to run (use instead of file and grep)
+ * max_lines: max lines to keep (0 -> infinite)
*/
map data = $[];
@@ -84,42 +88,75 @@
if (max_lines == 0)
return;
- integer sl = size(lines);
- if (sl > max_lines)
- {
- lines = filter(string l, lines, {
- sl = sl - 1;
- return sl < max_lines;
- });
- }
+ if (size(lines) - max_lines - 1 > 0)
+ lines = sublist(lines, size(lines) - max_lines - 1);
}
/**
* Starts the log reading command via process agent.
*
- * The LogView widget must exist when calling this function.
- *
- * Note: This function has less functionality than InitLogReading in LogView.ycp.
- * The extra functionality was removed here since it was broken (bnc #371983).
+ * The LogView widget must exist when calling this function. The `MaxLines
+ * parameter of the widget will be set.
*/
global void Start(term widget, map d)
{
+ if (id != nil)
+ {
+ SCR::Execute(.process.release, id);
+ id = nil;
+ }
+
data = d;
- integer max_lines = data["max_lines"]:max_lines_default;
string file = data["file"]:"";
+ string grep = data["grep"]:"";
+ string command = data["command"]:"";
+ integer max_lines = data["max_lines"]:max_lines_default;
- list<string> args = [ "--retry", "-n", tostring(max_lines_default), "-f", file ];
- id = (integer) SCR::Execute (.process.start, "/usr/bin/tail", $[ "args" : args ]);
+ if (command == "")
+ {
+ if (grep == "")
+ {
+ command = sformat("tail -n %1 -f '%2'", max_lines, file);
+ }
+ else
+ {
+ command = sformat("tail -n +0 -f '%1' | grep --line-buffered '%2'", file, grep);
+
+ if (max_lines != 0)
+ {
+ string lc_command = sformat ("cat '%1' | grep '%2' | wc -l", file, grep);
+ map bash_output = (map) SCR::Execute (.target.bash_output, lc_command);
+ if (bash_output["exit"]:1 == 0)
+ {
+ string lc = filterchars (bash_output["stdout"]:"", "1234567890");
+ integer lines_count = tointeger (lc);
+
+ // don't know why without doubling it discards more lines,
+ // out of YaST2 it works
+ lines_count = lines_count - 2 * max_lines;
+ if (lines_count < 0)
+ lines_count = 0;
+
+ if (lines_count > 0)
+ command = command + sformat(" | tail -n +%1", lines_count);
+ }
+ }
+ }
+ }
+
+ y2milestone ("Calling process agent with command %1", command);
+
+ id = (integer) SCR::Execute (.process.start_shell, command, $[ "tty" : true ]);
is_running = true;
- y2debug("started tail with args %1", args);
sleep(100);
lines = GetNewLines();
DeleteOldLines();
+ UI::ChangeWidget(widget, `MaxLines, max_lines);
UI::ChangeWidget(widget, `Value, mergestring(
maplist(string line, lines, { return line + "\n"; } ), ""));
}
@@ -127,21 +164,28 @@
global void Update(term widget)
{
- list<string> new_lines = GetNewLines();
- if (size(new_lines) > 0)
+ if (id != nil)
{
- lines = (list<string>) merge(lines, new_lines);
- DeleteOldLines();
-
- UI::ChangeWidget(widget, `LastLine, mergestring(
- maplist(string line, new_lines, { return line + "\n"; } ), ""));
+ list<string> new_lines = GetNewLines();
+ if (size(new_lines) > 0)
+ {
+ lines = (list<string>) merge(lines, new_lines);
+ DeleteOldLines();
+
+ UI::ChangeWidget(widget, `LastLine, mergestring(
+ maplist(string line, new_lines, { return line + "\n"; } ), ""));
+ }
}
}
global void Stop()
{
- SCR::Execute(.process.release, id);
+ if (id != nil)
+ {
+ SCR::Execute(.process.release, id);
+ id = nil;
+ }
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.48/library/log/src/LogView.ycp new/yast2-2.16.49/library/log/src/LogView.ycp
--- old/yast2-2.16.48/library/log/src/LogView.ycp 2008-04-10 10:09:06.000000000 +0200
+++ new/yast2-2.16.49/library/log/src/LogView.ycp 2008-04-13 14:46:09.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Displaying a log with additional functionality
* Authors: Jiri Srain
*
- * $Id: LogView.ycp 46287 2008-04-09 13:27:39Z jsrain $
+ * $Id: LogView.ycp 46487 2008-04-13 12:46:09Z aschnell $
*
* All of these functions watch the log file and display
* added lines as the log grows.
@@ -23,8 +23,6 @@
* ],
* ]);
* </pre>
- *
- * TODO: Use LogViewCore.ycp (but it has less functionality)
*/
{
@@ -36,15 +34,10 @@
import "Popup";
import "Label";
import "Report";
+import "LogViewCore";
// fallback settings variables
-/**
- * default value of maximum displayed lines
- */
-integer max_lines_default = 100;
-
-
// configuration variables
/**
@@ -68,19 +61,6 @@
list<list> mb_actions = [];
-// status variables
-
-/**
- * current lines of the selected log
- */
-list<string> lines = [];
-
-/**
- * ID of process for the process agent
- */
-integer process_id = nil;
-
-
// local functions
/**
@@ -93,73 +73,12 @@
}
/**
- * Get maximum lines to display for a log
- * @param log_descr a map describing the log
- * @return integer maximum log lines to display
- */
-define integer GetMaxLines (map log_descr) {
- return log_descr["max_lines"]:param["max_lines"]:max_lines_default;
-}
-
-/**
* Starts the log reading command via process agent
* @param index integer the index of the log file
*/
define void InitLogReading (integer index) {
- if (process_id != nil)
- SCR::Execute (.process.kill, process_id);
- process_id = nil;
map log_descr = Index2Descr (index);
- integer max_lines = GetMaxLines (log_descr);
- string command = (string) (log_descr["command"]:nil);
- if (command == nil || command == "")
- {
- string file = log_descr["file"]:"";
- if (file == nil || file == "")
- {
- // error report
- Report::Error (_("Error occurred while reading the log."));
- return;
- }
- string grep = log_descr["grep"]:"";
- if (grep != "" && grep != nil)
- grep = sformat ("| grep '%1'", grep);
- string lc_command
- = sformat ("cat %1 %2 | wc -l", log_descr["file"]:"", grep);
- map bash_output = (map)SCR::Execute (.target.bash_output, lc_command);
- command = "tail -n +0 -f " + log_descr["file"]:"";
- string addon = "";
- integer lines_count = 0;
- if (bash_output["exit"]:1 == 0)
- {
- string lc = bash_output["stdout"]:"";
- lc = filterchars (lc, "1234567890");
- lines_count = tointeger (lc);
- lines_count = lines_count - 2 * max_lines;
- // don't know why without
- // doubling it discards more lines, out of YaST2
- // it works
- if (lines_count < 0)
- lines_count = 0;
- if (max_lines != 0 && lines_count > 0)
- addon = sformat ("| tail -n +%1", lines_count);
- }
- if (grep != "" && grep != nil)
- command = sformat ("%1 %2 %3", command, grep, addon);
- else if (addon != "")
- command = sformat ("/usr/bin/tail -n +%2 -f %1", log_descr["file"]:"", lines_count);
- else
- command = sformat ("/usr/bin/tail -n +0 -f %1", log_descr["file"]:"");
- }
- y2milestone ("Calling process agent with command %1", command);
-
- process_id = (integer)SCR::Execute (.process.start_shell, command);
- if (process_id == nil)
- {
- // error report
- Report::Error (_("Error occurred while reading the log."));
- return;
- }
+ LogViewCore::Start(`id(`_cwm_log), log_descr);
}
/**
@@ -167,59 +86,7 @@
* @param key log widget key
*/
define void KillBackgroundProcess (string key) {
- if (process_id != nil)
- SCR::Execute (.process.kill, process_id);
- process_id = nil;
-}
-
-/**
- * Remove unneeded items from a list
- * If max_lines is 0, then don't remove anything
- * @param lines a list of strings representing log lines
- * @param max_lines integer lines that should be saved
- * @return a list last max_lines of lines
- * FIXME probably used in multiple locations!!!
- * FIXME variables are global, no need to have them as parameters
- */
-define list<string> DeleteOldLines (list<string> lines, integer max_lines) {
- if (0 == max_lines)
- return lines;
- integer sl = size (lines);
- if (sl > max_lines)
- {
- lines = filter (string l, lines, {
- sl = sl -1;
- return sl < max_lines;
- });
- }
- return lines;
-}
-
-/**
- * Fills the log widget with initial data got from the process agent
- * @param index integer index of the log file
- */
-define void FillWidgetWithData (integer index) {
- sleep (100);
- map log = Index2Descr (index);
- integer max_lines = GetMaxLines (log);
-
- integer count = 0;
- lines = [];
- string line = (string)SCR::Read (.process.read_line, process_id);
- while (line != nil)
- {
- count = count + 1;
- lines = add (lines, line);
- line = (string)SCR::Read (.process.read_line, process_id);
- }
-
- if (count > 0)
- {
- lines = DeleteOldLines (lines, max_lines);
- UI::ChangeWidget (`id (`_cwm_log), `Value,
- mergestring (lines, "\n") + "\n");
- }
+ LogViewCore::Stop();
}
/**
@@ -487,18 +354,16 @@
* @param index integer index of the log to display
*/
define void LogSwitch (integer index) {
- lines = [];
current_index = index;
map log_descr = Index2Descr (index);
// logview caption
string caption = log_descr["log_label"]:param["log_label"]:_("&Log");
- integer max_lines = GetMaxLines (log_descr);
+
UI::ReplaceWidget (`_cwm_log_rp,
- `LogView (`id (`_cwm_log), caption, 15, max_lines));
+ `LogView (`id (`_cwm_log), caption, 15, 0));
InitLogReading (index);
- FillWidgetWithData (index);
}
/**
@@ -524,25 +389,7 @@
*/
global define symbol LogHandle (string key, map event) {
param = CWM::GetProcessedWidget ();
- map log = Index2Descr (current_index);
- integer max_lines = GetMaxLines (log);
- list<string> new_lines = [];
- integer count = 0;
- string line = (string)SCR::Read (.process.read_line, process_id);
- while (line != nil)
- {
- count = count + 1;
- new_lines = add (new_lines, line);
- line = (string)SCR::Read (.process.read_line, process_id);
- }
- if (count > 0)
- {
- foreach (string l, new_lines, {
- UI::ChangeWidget (`id (`_cwm_log), `LastLine, l + "\n");
- });
- lines = (list<string>) merge (lines, new_lines);
- lines = DeleteOldLines (lines, max_lines);
- }
+ LogViewCore::Update(`id(`_cwm_log));
any ret = event["ID"]:nil;
// save the displayed log to file
if (ret == `_cwm_log_save)
@@ -553,7 +400,7 @@
if (filename != nil)
{
SCR::Write (.target.string, filename,
- mergestring (lines, "\n") + "\n");
+ mergestring (LogViewCore::GetLines(), "\n") + "\n");
}
}
// other operation specified by user
@@ -630,7 +477,6 @@
{
// logview caption
string caption = param["log_label"]:_("&Log");
- integer max_lines = param["max_lines"]:max_lines_default;
integer height = param["widget_height"]:15;
integer default_index = GetDefaultItemForLogsCombo (log_files);
@@ -643,7 +489,7 @@
"custom_widget" : `VBox (
top_bar,
`ReplacePoint (`id (`_cwm_log_rp),
- `LogView (`id (`_cwm_log), caption, height, max_lines)
+ `LogView (`id (`_cwm_log), caption, height, 0)
),
bottom_bar
),
@@ -701,20 +547,17 @@
// menubutton
string mb_label = param["mb_label"]:_("Ad&vanced");
- integer max_lines = param["max_lines"]:max_lines_default;
string log_label = param["log_label"]:_("&Log");
logs = [param];
- InitLogReading (0);
-
term button_line = GetButtonsBelowLog (true, param, [param]);
UI::OpenDialog (`HBox (`HSpacing (1), `VBox (
`VSpacing (1),
`HSpacing (70),
// log view header
- `LogView (`id (`_cwm_log), log_label, 19, max_lines),
+ `LogView (`id (`_cwm_log), log_label, 19, 0),
`VSpacing (1),
button_line,
`VSpacing (1)), `HSpacing (1)));
@@ -726,7 +569,7 @@
}
mb_actions = param["actions"]:[];
- FillWidgetWithData (0);
+ InitLogReading (0);
any ret = nil;
while (ret != `close && ret != `cancel)
@@ -753,9 +596,7 @@
LogHandle ("", event);
}
}
- if (process_id != nil)
- SCR::Execute (.process.kill, process_id);
- process_id = nil;
+ LogViewCore::Stop();
UI::CloseDialog ();
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.48/library/modules/Version.ycp new/yast2-2.16.49/library/modules/Version.ycp
--- old/yast2-2.16.48/library/modules/Version.ycp 2008-04-10 15:10:19.000000000 +0200
+++ new/yast2-2.16.49/library/modules/Version.ycp 2008-04-13 14:51:26.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.16.48";
+global string yast2 = "2.16.49";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.48/library/packages/src/PackageCallbacks.ycp new/yast2-2.16.49/library/packages/src/PackageCallbacks.ycp
--- old/yast2-2.16.48/library/packages/src/PackageCallbacks.ycp 2008-04-03 14:11:35.000000000 +0200
+++ new/yast2-2.16.49/library/packages/src/PackageCallbacks.ycp 2008-04-11 19:07:13.000000000 +0200
@@ -7,7 +7,7 @@
*
* Purpose: provides the default Callbacks for Pkg::
*
- * $Id: PackageCallbacks.ycp 45989 2008-04-02 15:51:09Z lslezak $
+ * $Id: PackageCallbacks.ycp 46408 2008-04-11 12:58:31Z lslezak $
*
*/
@@ -1953,6 +1953,8 @@
return !download_aborted;
}
+
+ return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.48/library/system/src/FileChanges.ycp new/yast2-2.16.49/library/system/src/FileChanges.ycp
--- old/yast2-2.16.48/library/system/src/FileChanges.ycp 2008-03-31 15:58:46.000000000 +0200
+++ new/yast2-2.16.49/library/system/src/FileChanges.ycp 2008-04-11 19:07:13.000000000 +0200
@@ -79,14 +79,14 @@
* @return boolean true of was changed
*/
boolean FileChangedFromPackage (string file) {
- string cmd = sformat ("/bin/rpm -qf %1", file);
+ // queryformat: no trailing newline!
+ string cmd = sformat ("/bin/rpm -qf %1 --qf %%{NAME}-%%{VERSION}-%%{RELEASE}", file);
map out = (map)SCR::Execute (.target.bash_output, cmd);
string package = out["stdout"]:"";
y2milestone ("Package owning %1: %2", file, package);
if (package == "")
return false;
- // FIXME: /bin/xx finds also /usr/bin/xx
- cmd = sformat ("rpm -V %1 |grep %2", package, file);
+ cmd = sformat ("rpm -V %1 |grep ' %2$'", package, file);
out = (map)SCR::Execute (.target.bash_output, cmd);
string changes = out["stdout"]:"";
y2milestone ("File possibly changed: %1", changes);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.48/library/wizard/src/Wizard.ycp new/yast2-2.16.49/library/wizard/src/Wizard.ycp
--- old/yast2-2.16.48/library/wizard/src/Wizard.ycp 2008-04-10 10:09:07.000000000 +0200
+++ new/yast2-2.16.49/library/wizard/src/Wizard.ycp 2008-04-11 19:07:13.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Wizard dialog
* Authors: Stefan Hundhammer
*
- * $Id: Wizard.ycp 46042 2008-04-03 14:33:54Z kmachalkova $
+ * $Id: Wizard.ycp 46451 2008-04-11 16:37:42Z locilka $
*
* Provides the wizard dialog (common screen for all YaST2 installation
* modules) and functions to set the contents, to replace and restore
@@ -113,6 +113,19 @@
);
}
+ /**
+ * Returns a button box with buttons "Cancel", "OK"
+ * @return a widget tree
+ **/
+ global term CancelOKButtonBox() {
+ return `HBox(
+ `HWeight(1, `Empty() ), // Layout trick to make sure the center button is centered
+ `HStretch(),
+ `HWeight(1, `PushButton(`id(`cancel ), `opt (`key_F9), Label::CancelButton() ) ),
+ `HStretch(),
+ `HWeight(1, `PushButton(`id(`ok ), `opt (`key_F10, `default), Label::OKButton() ) )
+ );
+ }
/**
* Returns a button box with buttons "Abort", "Accept"
@@ -254,6 +267,16 @@
return GenericDialog( CancelAcceptButtonBox() );
}
+ /**
+ * Returns a standard wizard dialog with buttons "Cancel", "OK"
+ *
+ * @stable
+ *
+ * @return term describing the dialog.
+ **/
+ global term OKDialog() {
+ return GenericDialog( CancelOKButtonBox() );
+ }
/**
* Open any wizard dialog.
@@ -311,6 +334,29 @@
}
}
+ /**
+ * Open a dialog with "OK", "Cancel"
+ * and set the keyboard focus to "OK".
+ **/
+ global void OpenOKDialog()
+ {
+ if ( haveFancyUI() )
+ {
+ UI::OpenDialog(`opt(`defaultsize ),
+ `Wizard(`no_back_button, "",
+ `cancel, Label::CancelButton(),
+ `ok, Label::OKButton() ) );
+
+ // Don't let sloppy calls to Wizard::SetContents() disable this button by accident
+ UI::WizardCommand(`ProtectNextButton( true ) );
+ }
+ else
+ {
+ Wizard::OpenDialog( OKDialog() );
+ UI::SetFocus(`id(`ok) );
+ }
+ }
+
/**
* Open a dialog with "Accept", "Cancel"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.48/Makefile.am new/yast2-2.16.49/Makefile.am
--- old/yast2-2.16.48/Makefile.am 2008-04-10 15:10:03.000000000 +0200
+++ new/yast2-2.16.49/Makefile.am 2008-04-13 14:51:10.000000000 +0200
@@ -23,13 +23,14 @@
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
-COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
+COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
+# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.48/Makefile.in new/yast2-2.16.49/Makefile.in
--- old/yast2-2.16.48/Makefile.in 2008-04-10 15:10:16.000000000 +0200
+++ new/yast2-2.16.49/Makefile.in 2008-04-13 14:51:24.000000000 +0200
@@ -221,11 +221,13 @@
DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
-COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
+COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
+
+# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.48/README new/yast2-2.16.49/README
--- old/yast2-2.16.48/README 2008-04-10 15:14:43.000000000 +0200
+++ new/yast2-2.16.49/README 2008-04-13 14:51:39.000000000 +0200
@@ -1,2 +1,2 @@
This program/library is part of YaST2
-See the file COPYRIGHT.english for license terms
+See the file COPYING for license terms
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.48/VERSION new/yast2-2.16.49/VERSION
--- old/yast2-2.16.48/VERSION 2008-04-10 15:06:38.000000000 +0200
+++ new/yast2-2.16.49/VERSION 2008-04-13 14:41:54.000000000 +0200
@@ -1 +1 @@
-2.16.48
+2.16.49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org