Hello community,
here is the log from the commit of package yast2
checked in at Tue Nov 27 17:42:44 CET 2007.
--------
--- yast2/yast2.changes 2007-11-23 16:23:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-11-27 16:49:13.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Nov 27 16:48:57 CET 2007 - mvidner@suse.cz
+
+- Wizard::ShowReleaseNotesButton id is string, not any.
+- 2.16.13
+
+-------------------------------------------------------------------
+Tue Nov 27 13:47:41 CET 2007 - mvidner@suse.cz
+
+- /sbin/yast2: Factored out the y2base loop. Exit it on failure (#343258).
+
+-------------------------------------------------------------------
Old:
----
yast2-2.16.12.tar.bz2
New:
----
yast2-2.16.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.J20743/_old 2007-11-27 17:42:28.000000000 +0100
+++ /var/tmp/diff_new_pack.J20743/_new 2007-11-27 17:42:28.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.16.12)
+# spec file for package yast2 (Version 2.16.13)
#
# 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
-Version: 2.16.12
+Version: 2.16.13
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.16.12.tar.bz2
+Source0: yast2-2.16.13.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-pkg-bindings yast2-testsuite
@@ -123,7 +123,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.16.12
+%setup -n yast2-2.16.13
%build
%{prefix}/bin/y2tool y2autoconf
@@ -226,6 +226,11 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Tue Nov 27 2007 - mvidner@suse.cz
+- Wizard::ShowReleaseNotesButton id is string, not any.
+- 2.16.13
+* Tue Nov 27 2007 - mvidner@suse.cz
+- /sbin/yast2: Factored out the y2base loop. Exit it on failure (#343258).
* Fri Nov 23 2007 - mzugec@suse.cz
- fixed URL module for "smb" type
- 2.16.12
++++++ yast2-2.16.12.tar.bz2 -> yast2-2.16.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.12/configure new/yast2-2.16.13/configure
--- old/yast2-2.16.12/configure 2007-11-23 16:17:38.000000000 +0100
+++ new/yast2-2.16.13/configure 2007-11-27 16:49:53.000000000 +0100
@@ -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.11.
+# Generated by GNU Autoconf 2.61 for yast2 2.16.13.
#
# 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.11'
-PACKAGE_STRING='yast2 2.16.11'
+PACKAGE_VERSION='2.16.13'
+PACKAGE_STRING='yast2 2.16.13'
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.11 to adapt to many kinds of systems.
+\`configure' configures yast2 2.16.13 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.11:";;
+ short | recursive ) echo "Configuration of yast2 2.16.13:";;
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.11
+yast2 configure 2.16.13
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.11, which was
+It was created by yast2 $as_me 2.16.13, 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.11'
+ VERSION='2.16.13'
cat >>confdefs.h <<_ACEOF
@@ -2410,7 +2410,8 @@
-VERSION="2.16.11"
+
+VERSION="2.16.13"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -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.11, which was
+This file was extended by yast2 $as_me 2.16.13, 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.11
+yast2 config.status 2.16.13
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.12/configure.in new/yast2-2.16.13/configure.in
--- old/yast2-2.16.12/configure.in 2007-11-23 16:17:31.000000000 +0100
+++ new/yast2-2.16.13/configure.in 2007-11-27 16:49:37.000000000 +0100
@@ -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.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.16.11, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.16.13, 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.11"
+VERSION="2.16.13"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.12/COPYRIGHT.english new/yast2-2.16.13/COPYRIGHT.english
--- old/yast2-2.16.12/COPYRIGHT.english 2007-11-23 16:23:04.000000000 +0100
+++ new/yast2-2.16.13/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.12/library/modules/Version.ycp new/yast2-2.16.13/library/modules/Version.ycp
--- old/yast2-2.16.12/library/modules/Version.ycp 2007-11-23 16:22:29.000000000 +0100
+++ new/yast2-2.16.13/library/modules/Version.ycp 2007-11-27 16:50:28.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.16.12";
+global string yast2 = "2.16.13";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.12/library/types/src/URL.ycp new/yast2-2.16.13/library/types/src/URL.ycp
--- old/yast2-2.16.12/library/types/src/URL.ycp 2007-11-23 16:22:15.000000000 +0100
+++ new/yast2-2.16.13/library/types/src/URL.ycp 2007-11-27 13:47:04.000000000 +0100
@@ -6,7 +6,7 @@
* Anas Nashif
* Flags: Stable
*
- * $Id: URL.ycp 42370 2007-11-23 15:22:14Z mzugec $
+ * $Id: URL.ycp 42401 2007-11-26 14:34:19Z mzugec $
*/
{
@@ -175,7 +175,7 @@
/* Extract basic URL parts: scheme://host/path?question#part */
list rawtokens = regexptokenize(url, "^" +
/* 0,1: http:// */
- "(([^:/?#]+)://)?" +
+ "(([^:/?#]+):[/]*)?" +
/* 2: user:pass@www.suse.cz:23 */
"([^/?#]*)?" +
/* 3: /some/path */
@@ -295,8 +295,8 @@
if(regexpmatch(tokens["scheme"]:"", "^[[:alpha:]]*$"))
{
- if (tokens["scheme"]:"" == "samba") url="smb";
- else url = tokens["scheme"]:"";
+/* if (tokens["scheme"]:"" == "samba") url="smb";
+ else*/ url = tokens["scheme"]:"";
}
y2debug("url: %1", url);
if (tokens["user"]:"" != "")
@@ -313,7 +313,7 @@
url = sformat("%1://%2", url, userpass);
y2debug("url: %1", url);
- if (tokens["scheme"]:"" == "samba" && size(tokens["domain"]:"")>0 ){
+ if (tokens["scheme"]:"" == "smb" && size(tokens["domain"]:"")>0 ){
url = sformat("%1%2/", url, tokens["domain"]:"");
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.12/library/wizard/src/Wizard.ycp new/yast2-2.16.13/library/wizard/src/Wizard.ycp
--- old/yast2-2.16.12/library/wizard/src/Wizard.ycp 2007-10-29 10:01:10.000000000 +0100
+++ new/yast2-2.16.13/library/wizard/src/Wizard.ycp 2007-11-27 16:39:14.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Wizard dialog
* Authors: Stefan Hundhammer
*
- * $Id: Wizard.ycp 37097 2007-03-23 11:48:49Z jsrain $
+ * $Id: Wizard.ycp 42451 2007-11-27 14:56:43Z sh-sh-sh $
*
* Provides the wizard dialog (common screen for all YaST2 installation
* modules) and functions to set the contents, to replace and restore
@@ -890,9 +890,7 @@
{
string icon = icon_name == "" ? "" : ( icon_path + "/" + icon_name + ".png" );
- // UI::WizardCommand(`SetVerboseCommands( true ) );
UI::WizardCommand(`SetDialogIcon( icon ) );
- // UI::WizardCommand(`SetVerboseCommands( false ) );
}
@@ -1079,7 +1077,7 @@
/**
* Show a "Release Notes" button with the specified label and ID if there is a "steps" panel
**/
- global void ShowReleaseNotesButton( string label, any id )
+ global void ShowReleaseNotesButton( string label, string id )
{
if ( UI::WizardCommand(`ShowReleaseNotesButton( label, id ) ) == false )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.12/Makefile.am new/yast2-2.16.13/Makefile.am
--- old/yast2-2.16.12/Makefile.am 2007-11-23 16:17:32.000000000 +0100
+++ new/yast2-2.16.13/Makefile.am 2007-11-27 16:49:38.000000000 +0100
@@ -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.12/Makefile.in new/yast2-2.16.13/Makefile.in
--- old/yast2-2.16.12/Makefile.in 2007-11-23 16:17:53.000000000 +0100
+++ new/yast2-2.16.13/Makefile.in 2007-11-27 16:50:21.000000000 +0100
@@ -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.12/README new/yast2-2.16.13/README
--- old/yast2-2.16.12/README 2007-11-23 16:23:04.000000000 +0100
+++ new/yast2-2.16.13/README 2007-11-27 17:12:17.000000000 +0100
@@ -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.12/scripts/yast2 new/yast2-2.16.13/scripts/yast2
--- old/yast2-2.16.12/scripts/yast2 2007-11-21 15:26:04.000000000 +0100
+++ new/yast2-2.16.13/scripts/yast2 2007-11-27 13:45:24.000000000 +0100
@@ -14,8 +14,16 @@
export PATH=/sbin:/usr/sbin:$PATH
+# allow for a different prefix
+mydir=${0%/[YyZz]a[Ss][Tt]*}
+if [ -z "$mydir" -o "$mydir" = "/sbin" ]; then
+ YAST_PREFIX=/usr
+else
+ YAST_PREFIX=${mydir%/sbin}
+fi
+
# load common script functions
-. /usr/lib/YaST2/bin/yast2-funcs
+. $YAST_PREFIX/lib/YaST2/bin/yast2-funcs
# #211392, #265263
@@ -31,6 +39,8 @@
fi
}
+exit_code=0
+
exit_trap()
{
# handily, exit_code is set to $? of y2base.
@@ -46,6 +56,7 @@
# Accumulated arguments for both the Qt UI and y2cc; currently supported:
# --fullscreen
# --noborder
+# well also for gtk and ncurses
Y2QT_ARGS=""
GNOME_SHELL="$ybindir/y2controlcenter-gnome"
KDE_SHELL="$ybindir/y2controlcenter"
@@ -78,7 +89,7 @@
listmodules()
{
- list=`/bin/ls -1 /usr/share/applications/YaST2/*.desktop 2>/dev/null`
+ list=`/bin/ls -1 $YAST_PREFIX/share/applications/YaST2/*.desktop 2>/dev/null`
if [ -z "$list" ] ; then
echo "No modules installed"
@@ -196,6 +207,13 @@
shift
fi
+# Transform every argument into a ycp string, that is surround all
+# args by ("..."). args may contain spaces.
+a=("$@")
+b=("${a[@]/#/(\"}")
+c=("${b[@]/%/\")}")
+set -- "${c[@]}"
+
case "`/usr/bin/basename $0`" in
YaST|yast|yast1|zast)
unset DISPLAY
@@ -332,47 +350,17 @@
fi
# this fixes launching of interactive subprocesses, #150799
- NCTHREADS=--nothreads
+ Y2QT_ARGS="$Y2QT_ARGS --nothreads"
# set color theme, if defined
if [ ! -z "$Y2NCURSES_COLOR_THEME" ]; then
export Y2NCURSES_COLOR_THEME="$Y2NCURSES_COLOR_THEME"
fi
- # use menu.ycp
- # TODO: this does not need to be a special case. refactor after release
- if [ $module == "menu" ] ; then
- while true ; do
- $ybindir/y2base menu ncurses $NCTHREADS
- exit_code=$?
- if [ ! -e "/var/lib/YaST2/restart_menu" ] ; then
- break
- fi
- done
- else
- # Transform every argument into a ycp string, that is surround all
- # args by ("..."). args may contain spaces.
- a=("$@")
- b=("${a[@]/#/(\"}")
- c=("${b[@]/%/\")}")
- set -- "${c[@]}"
-
- while true ; do
- $ybindir/y2base "$module" "$@" ncurses $NCTHREADS
- exit_code=$?
- if [ ! $module == "online_update" -o ! -e "/var/lib/YaST2/selected_patches.ycp" ] ; then
- break
- fi
- done
- fi
- if [ "$UC_STARTED" = "yes" -a -x /bin/unicode_stop ] ; then
- /bin/unicode_stop
- UC_STARTED=no
- fi
else
rpm -V yast2-core yast2-ncurses yast2-qt yast2-gtk >&2
echo "Something is wrong with the YaST user interface." >&2
- exit_code=1
+ exit_code=1 # also skips y2base later
fi
# quick hack: treat gtk like qt
elif [ "$SELECTED_GUI" = "qt" -o "$SELECTED_GUI" = "gtk" ]; then
@@ -384,12 +372,7 @@
if [ $module == "menu" ]; then
select_control_center
fi
-
- if [ $module == "menu" -a -e "$y2ccbin" ] ; then
- $y2ccbin $Y2QT_ARGS "$@"
- exit_code=$?
- else
-
+
# Special case: "sw_single" needs a lot of screen space -
# always start it in full screen mode.
#
@@ -409,25 +392,36 @@
esac
fi
fi
+else
+ echo >&2 "Internal error, unhandled '$SELECTED_GUI'"
+fi
- # Transform every argument into a ycp string, that is surround all
- # args by ("..."). args may contain spaces.
- a=("$@")
- b=("${a[@]/#/(\"}")
- c=("${b[@]/%/\")}")
- set -- "${c[@]}"
- while true ; do
+# do it!
+# $@ are args for ycp
+if [ $module == "menu" -a -f "$y2ccbin" ] ; then
+ $y2ccbin $Y2QT_ARGS "$@"
+ exit_code=$?
+else
+ # loop while necessary
+ case "$module" in
+ menu) REDO_FILE=/var/lib/YaST2/restart_menu ;;
+ online_update) REDO_FILE=/var/lib/YaST2/selected_patches.ycp ;;
+ *) ;;
+ esac
+ # break out on errors, #343258
+ while [ $exit_code = 0 ]; do
$ybindir/y2base $module "$@" "$SELECTED_GUI" $Y2_GEOMETRY $Y2QT_ARGS
exit_code=$?
-
- if [ ! $module == "online_update" -o ! -e "/var/lib/YaST2/selected_patches.ycp" ] ; then
+ if [ -z "$REDO_FILE" -o ! -f "$REDO_FILE" ]; then
break
fi
- done
- fi
-else
- echo >&2 "Internal error, unhandled '$SELECTED_GUI'"
+ done
+fi
+
+# cleanup
+if [ "$UC_STARTED" = "yes" -a -x /bin/unicode_stop ] ; then
+ /bin/unicode_stop
fi
if [ "$UID" = 0 ]; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.12/scripts/yast2-funcs new/yast2-2.16.13/scripts/yast2-funcs
--- old/yast2-2.16.12/scripts/yast2-funcs 2007-10-29 10:01:14.000000000 +0100
+++ new/yast2-2.16.13/scripts/yast2-funcs 2007-11-27 09:48:06.000000000 +0100
@@ -3,10 +3,12 @@
# Summary: Common functions for YaST2 start scripts
# Authors: Arvin Schnell
#
-# $Id: yast2-funcs 40784 2007-09-06 12:37:03Z tgoettlicher $
+# $Id: yast2-funcs 42417 2007-11-27 08:48:05Z mvidner $
+# allow for a different prefix
+: ${YAST_PREFIX=/usr}
# some path definitions
-ybindir=/usr/lib/YaST2/bin
+ybindir=$YAST_PREFIX/lib/YaST2/bin
logdir=/var/log/YaST2
@@ -21,9 +23,9 @@
#
function get_plugindir()
{
- plugindir=/usr/lib/YaST2/plugin
+ plugindir=$YAST_PREFIX/lib/YaST2/plugin
if `ldd $ybindir/y2base | egrep --quiet "/lib64/(.*/)?libc.so"` ; then
- plugindir=/usr/lib64/YaST2/plugin
+ plugindir=$YAST_PREFIX/lib64/YaST2/plugin
fi
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.12/VERSION new/yast2-2.16.13/VERSION
--- old/yast2-2.16.12/VERSION 2007-11-23 16:21:26.000000000 +0100
+++ new/yast2-2.16.13/VERSION 2007-11-27 16:49:08.000000000 +0100
@@ -1 +1 @@
-2.16.12
+2.16.13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org