Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2013-10-21 12:35:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2013-10-14 09:33:14.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2013-10-21 12:35:42.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Oct 15 14:15:31 CEST 2013 - [email protected]
+
+- Added support for ignore[d][_]feature[s] (FATE#314982) allowing
+ to skip some unwanted features of the installer
+- 3.1.1
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.1.0.tar.bz2
New:
----
yast2-installation-3.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.XrdWhV/_old 2013-10-21 12:35:43.000000000 +0200
+++ /var/tmp/diff_new_pack.XrdWhV/_new 2013-10-21 12:35:43.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.0
+Version: 3.1.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -34,6 +34,7 @@
BuildRequires: docbook-xsl-stylesheets
BuildRequires: libxslt
+BuildRequires: rubygem-rspec
BuildRequires: update-desktop-files
BuildRequires: yast2-core-devel
BuildRequires: yast2-devtools >= 3.0.6
@@ -216,12 +217,10 @@
%dir %{yast_docdir}
%{yast_docdir}/COPYING
-%readme %{yast_docdir}/README
%files devel-doc
%defattr(-,root,root)
%doc %{yast_docdir}
%exclude %{yast_docdir}/COPYING
-%exclude %{yast_docdir}/README
%changelog
++++++ yast2-installation-3.1.0.tar.bz2 -> yast2-installation-3.1.1.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.0/COPYING
new/yast2-installation-3.1.1/COPYING
--- old/yast2-installation-3.1.0/COPYING 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-installation-3.1.1/COPYING 2013-10-18 12:50:05.000000000
+0200
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser 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.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ 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.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser General
+Public License instead of this License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.0/SUBDIRS
new/yast2-installation-3.1.1/SUBDIRS
--- old/yast2-installation-3.1.0/SUBDIRS 2013-10-11 16:29:52.000000000
+0200
+++ new/yast2-installation-3.1.1/SUBDIRS 2013-10-18 12:50:05.000000000
+0200
@@ -1 +1 @@
-src doc startup control autoyast_desktop
+src doc startup control autoyast_desktop test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.0/VERSION
new/yast2-installation-3.1.1/VERSION
--- old/yast2-installation-3.1.0/VERSION 2013-10-11 16:29:52.000000000
+0200
+++ new/yast2-installation-3.1.1/VERSION 2013-10-18 12:50:05.000000000
+0200
@@ -1 +1 @@
-3.1.0
+3.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.0/control/control.SLED.xml
new/yast2-installation-3.1.1/control/control.SLED.xml
--- old/yast2-installation-3.1.0/control/control.SLED.xml 2013-10-11
16:29:52.000000000 +0200
+++ new/yast2-installation-3.1.1/control/control.SLED.xml 2013-10-18
12:50:05.000000000 +0200
@@ -56,6 +56,7 @@
<copy_to_system config:type="list">
<!-- FATE #300421: Import ssh keys from previous installations -->
<copy_to_system_item>
+ <id>import_ssh_keys</id>
<copy_to_dir>/</copy_to_dir>
<!-- Files that must be all present on the previous system -->
<mandatory_files config:type="list">
@@ -75,6 +76,7 @@
<!-- FATE #120103: Import Users From Existing Partition -->
<copy_to_system_item>
+ <id>import_users</id>
<copy_to_dir>/var/lib/YaST2/imported/userdata/</copy_to_dir>
<!-- Files that must be all present on the previous system -->
<mandatory_files config:type="list">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.0/control/control.SLES-for-VMware.xml
new/yast2-installation-3.1.1/control/control.SLES-for-VMware.xml
--- old/yast2-installation-3.1.0/control/control.SLES-for-VMware.xml
2013-10-11 16:29:52.000000000 +0200
+++ new/yast2-installation-3.1.1/control/control.SLES-for-VMware.xml
2013-10-18 12:50:05.000000000 +0200
@@ -53,6 +53,7 @@
<copy_to_system config:type="list">
<!-- FATE #300421: Import ssh keys from previous installations -->
<copy_to_system_item>
+ <id>import_ssh_keys</id>
<copy_to_dir>/</copy_to_dir>
<!-- Files that must be all present on the previous system -->
<mandatory_files config:type="list">
@@ -72,6 +73,7 @@
<!-- FATE #120103: Import Users From Existing Partition -->
<copy_to_system_item>
+ <id>import_users</id>
<copy_to_dir>/var/lib/YaST2/imported/userdata/</copy_to_dir>
<!-- Files that must be all present on the previous system -->
<mandatory_files config:type="list">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.0/control/control.SLES.xml
new/yast2-installation-3.1.1/control/control.SLES.xml
--- old/yast2-installation-3.1.0/control/control.SLES.xml 2013-10-11
16:29:52.000000000 +0200
+++ new/yast2-installation-3.1.1/control/control.SLES.xml 2013-10-18
12:50:05.000000000 +0200
@@ -53,6 +53,7 @@
<copy_to_system config:type="list">
<!-- FATE #300421: Import ssh keys from previous installations -->
<copy_to_system_item>
+ <id>import_ssh_keys</id>
<copy_to_dir>/</copy_to_dir>
<!-- Files that must be all present on the previous system -->
<mandatory_files config:type="list">
@@ -72,6 +73,7 @@
<!-- FATE #120103: Import Users From Existing Partition -->
<copy_to_system_item>
+ <id>import_users</id>
<copy_to_dir>/var/lib/YaST2/imported/userdata/</copy_to_dir>
<!-- Files that must be all present on the previous system -->
<mandatory_files config:type="list">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.0/control/control.openSUSE.xml
new/yast2-installation-3.1.1/control/control.openSUSE.xml
--- old/yast2-installation-3.1.0/control/control.openSUSE.xml 2013-10-11
16:29:52.000000000 +0200
+++ new/yast2-installation-3.1.1/control/control.openSUSE.xml 2013-10-18
12:50:05.000000000 +0200
@@ -59,6 +59,7 @@
<copy_to_system config:type="list">
<!-- FATE #300421: Import ssh keys from previous installations -->
<copy_to_system_item>
+ <id>import_ssh_keys</id>
<copy_to_dir>/</copy_to_dir>
<!-- Files that must be all present on the previous system -->
<mandatory_files config:type="list">
@@ -78,6 +79,7 @@
<!-- FATE #120103: Import Users From Existing Partition -->
<copy_to_system_item>
+ <id>import_users</id>
<copy_to_dir>/var/lib/YaST2/imported/userdata/</copy_to_dir>
<!-- Files that must be all present on the previous system -->
<mandatory_files config:type="list">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.0/control/control.rnc
new/yast2-installation-3.1.1/control/control.rnc
--- old/yast2-installation-3.1.0/control/control.rnc 2013-10-11
16:29:52.000000000 +0200
+++ new/yast2-installation-3.1.1/control/control.rnc 2013-10-18
12:50:05.000000000 +0200
@@ -183,6 +183,7 @@
copy_to_system = element copy_to_system {
LIST,
element copy_to_system_item {
+ element id { text } &
element copy_to_dir { text } &
element mandatory_files {
LIST,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.0/package/yast2-installation.changes
new/yast2-installation-3.1.1/package/yast2-installation.changes
--- old/yast2-installation-3.1.0/package/yast2-installation.changes
2013-10-11 16:29:52.000000000 +0200
+++ new/yast2-installation-3.1.1/package/yast2-installation.changes
2013-10-18 12:50:05.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Oct 15 14:15:31 CEST 2013 - [email protected]
+
+- Added support for ignore[d][_]feature[s] (FATE#314982) allowing
+ to skip some unwanted features of the installer
+- 3.1.1
+
+-------------------------------------------------------------------
Thu Oct 10 14:48:46 CEST 2013 - [email protected]
- Dropped modem and DSL detection (and configuration) from
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.0/package/yast2-installation.spec
new/yast2-installation-3.1.1/package/yast2-installation.spec
--- old/yast2-installation-3.1.0/package/yast2-installation.spec
2013-10-11 16:29:52.000000000 +0200
+++ new/yast2-installation-3.1.1/package/yast2-installation.spec
2013-10-18 12:50:05.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.0
+Version: 3.1.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -34,6 +34,7 @@
BuildRequires: docbook-xsl-stylesheets libxslt update-desktop-files
yast2-core-devel
BuildRequires: yast2-devtools >= 3.0.6
+BuildRequires: rubygem-rspec
# trang to convert rnc to rng
BuildRequires: trang
@@ -213,10 +214,8 @@
%dir %{yast_docdir}
%{yast_docdir}/COPYING
-%readme %{yast_docdir}/README
%files devel-doc
%defattr(-,root,root)
%doc %{yast_docdir}
%exclude %{yast_docdir}/COPYING
-%exclude %{yast_docdir}/README
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.0/src/clients/inst_pre_install.rb
new/yast2-installation-3.1.1/src/clients/inst_pre_install.rb
--- old/yast2-installation-3.1.0/src/clients/inst_pre_install.rb
2013-10-11 16:29:52.000000000 +0200
+++ new/yast2-installation-3.1.1/src/clients/inst_pre_install.rb
2013-10-18 12:50:05.000000000 +0200
@@ -30,10 +30,12 @@
Yast.import "ProductControl"
Yast.import "InstData"
Yast.import "String"
+ Yast.import "Linuxrc"
+ Yast.import "InstFunctions"
# --> Variables
- # all partitions that can be used as a
+ # all partitions that can be used as a source of data
@useful_partitions = []
@@ -53,12 +55,18 @@
:to => "list <map>"
)
- Builtins.foreach(@copy_items) do |one_copy_item|
- copy_to_dir = Builtins.tostring(
- Ops.get_string(one_copy_item, "copy_to_dir", Directory.vardir)
- )
- mandatory_files = Ops.get_list(one_copy_item, "mandatory_files", [])
- optional_files = Ops.get_list(one_copy_item, "optional_files", [])
+ @copy_items.each do |one_copy_item|
+ item_id = one_copy_item["id"]
+
+ if (InstFunctions.feature_ignored?(item_id))
+ Builtins.y2milestone("Feature #{item_id} skipped on user request")
+ next
+ end
+
+ copy_to_dir = one_copy_item.fetch("copy_to_dir",
Directory.vardir)
+ mandatory_files = one_copy_item.fetch("mandatory_files", [])
+ optional_files = one_copy_item.fetch("optional_files", [])
+
FindAndCopyNewestFiles(copy_to_dir, mandatory_files, optional_files)
end
end
@@ -248,6 +256,7 @@
nil
end
+
def Initialize
Builtins.y2milestone("Evaluating all current partitions")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.0/src/clients/inst_system_analysis.rb
new/yast2-installation-3.1.1/src/clients/inst_system_analysis.rb
--- old/yast2-installation-3.1.0/src/clients/inst_system_analysis.rb
2013-10-11 16:29:52.000000000 +0200
+++ new/yast2-installation-3.1.1/src/clients/inst_system_analysis.rb
2013-10-18 12:50:05.000000000 +0200
@@ -233,7 +233,7 @@
# FATE #302980: Simplified user config during installation
@actions_functions = Builtins.add(
@actions_functions,
- fun_ref(method(:FilesFromOldedSystems), "boolean ()")
+ fun_ref(method(:FilesFromOlderSystems), "boolean ()")
)
@visible_icons = Builtins.add(
@visible_icons,
@@ -513,7 +513,7 @@
ret
end
- def FilesFromOldedSystems
+ def FilesFromOlderSystems
# FATE #300421: Import ssh keys from previous installations
# FATE #120103: Import Users From Existing Partition
# FATE #302980: Simplified user config during installation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.0/src/modules/InstFunctions.rb
new/yast2-installation-3.1.1/src/modules/InstFunctions.rb
--- old/yast2-installation-3.1.0/src/modules/InstFunctions.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-installation-3.1.1/src/modules/InstFunctions.rb 2013-10-18
12:50:05.000000000 +0200
@@ -0,0 +1,88 @@
+# encoding: utf-8
+
+#
------------------------------------------------------------------------------
+# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+#
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of version 2 of the GNU General Public License as published by the
+# Free Software Foundation.
+#
+# 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, contact Novell, Inc.
+#
+# To contact Novell about this file by physical or electronic mail, you may
find
+# current contact information at www.novell.com.
+#
------------------------------------------------------------------------------
+
+# File: modules/InstFunctions.rb
+# Package: Installation
+# Summary: Installation functions
+# Authors: Lukas Ocilka <[email protected]>
+#
+# This library provides functions for installation clients that can be easily
tested
+#
+require "yast"
+
+module Yast
+ class InstFunctionsClass < Module
+ def main
+ textdomain "installation"
+
+ Yast.import "Linuxrc"
+ end
+
+ # Returns list of ignored features defined via Linuxrc commandline
+ #
+ # - Allowed format is ignore[d][_]feature[s]=$feature1[,$feature2,[...]]
+ # - Multiple ignored_features are allowed on one command line
+ # - Command and features are case-insensitive and all dashes
+ # and underscores are ignored
+ #
+ # @return [Array] ignored features
+ def ignored_features
+ return @ignored_features if @ignored_features
+
+ cmdline = Linuxrc.InstallInf("Cmdline").downcase.tr("-_", "").split
+ ignored_features = cmdline.select do |cmd|
+ cmd =~ /^ignored?features?=/i
+ end
+
+ ignored_features.collect! do |feature|
+ feature.gsub(/^ignored?features?=(.*)/i, '\1')
+ end
+
+ @ignored_features = ignored_features.map{ |f| f.split(',') }.flatten.uniq
+ end
+
+ # Resets the stored ignored features
+ # Used for easier testing
+ def reset_ignored_features
+ @ignored_features = nil
+ end
+
+ # Returns whether feature was set to be ignored, see ignored_features()
+ #
+ # @param [String] feature_name
+ # @return [Boolean] whether it's ignored
+ def feature_ignored?(feature_name)
+ if feature_name == nil
+ Builtins.y2warning("Undefined feature to check")
+ return false
+ end
+
+ feature = feature_name.downcase.tr("-_", "")
+ ignored_features.include?(feature)
+ end
+
+ publish :function => :ignored_features, :type => "list ()"
+ publish :function => :feature_ignored?, :type => "boolean (string)"
+ end
+
+ InstFunctions = InstFunctionsClass.new
+ InstFunctions.main
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.0/test/Makefile.am
new/yast2-installation-3.1.1/test/Makefile.am
--- old/yast2-installation-3.1.0/test/Makefile.am 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-installation-3.1.1/test/Makefile.am 2013-10-18
12:50:05.000000000 +0200
@@ -0,0 +1,7 @@
+TESTS = \
+ inst_functions.rb
+
+TEST_EXTENSIONS = .rb
+RB_LOG_COMPILER = rspec
+VERBOSE = 1
+EXTRA_DIST = $(TESTS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.1.0/test/inst_functions.rb
new/yast2-installation-3.1.1/test/inst_functions.rb
--- old/yast2-installation-3.1.0/test/inst_functions.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-installation-3.1.1/test/inst_functions.rb 2013-10-18
12:50:05.000000000 +0200
@@ -0,0 +1,118 @@
+#! /usr/bin/env rspec
+
+ENV["Y2DIR"] = File.expand_path("../../src", __FILE__)
+
+require "yast"
+
+Yast.import "InstFunctions"
+
+# For mocking
+Yast.import "Linuxrc"
+
+describe "when getting list of ignored features from Linuxrc" do
+ before(:each) do
+ Yast::InstFunctions.reset_ignored_features
+ end
+
+ it "returns empty list if no features were ignored on commandline" do
+ linuxrc_commandline = "othercommand=xyz no_ignore_features=1
something-else=555"
+
+ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
+ expect(Yast::InstFunctions.ignored_features.sort).to be_empty
+ end
+
+ it "returns empty list if features ignored on commandline were empty" do
+ linuxrc_commandline = "ignore_features="
+
+ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
+ expect(Yast::InstFunctions.ignored_features.sort).to be_empty
+ end
+
+ it "returns list of features set on commandline by two entries" do
+ linuxrc_commandline = "ignore_features=aa,b_b,c-c ignoredfeatures=a-a,dd
othercommand=xyz"
+ ignored_features = ["aa", "bb", "cc", "dd"].sort
+
+ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
+ expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features
+ end
+
+ it "returns list of features set on commandline by one entry" do
+ linuxrc_commandline = "ignore_features=x-x,yy"
+ ignored_features = ["xx", "yy"].sort
+
+ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
+ expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features
+ end
+
+ it "returns list of features set on commandline by several entries, each
feature in separate entry" do
+ linuxrc_commandline = "trash=install ignore_feature=feature1
ignored_features=feature2 ignore_features=feature3"
+ ignored_features = ["feature1", "feature2", "feature3"].sort
+
+ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
+ expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features
+ end
+
+ it "returns one feature set on commandline by one entry" do
+ linuxrc_commandline = "i-g-n-o-r-e_feature=fff"
+ ignored_features = ["fff"]
+
+ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
+ expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features
+ end
+
+ it "returns one feature set on commandline by one entry using up/down case"
do
+ linuxrc_commandline = "Ignore_FeaTUres=ffF"
+ ignored_features = ["fff"]
+
+ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
+ expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features
+ end
+end
+
+describe "when checking whether feature is ignored" do
+ before(:each) do
+ Yast::InstFunctions.reset_ignored_features
+ end
+
+ it "should be true if feature is exactly set on commandline" do
+ linuxrc_commandline = "trash=install ignore_features=feature1
ignored_features=feature2 ignore_features=feature3"
+
+ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
+ expect(Yast::InstFunctions.feature_ignored?("feature2")).to be_true
+ end
+
+ it "should be true if feature is exactly on commandline using up/down case"
do
+ linuxrc_commandline = "trash=install ignore_features=fEAture1
igno-RED_features=f-eatuRE_2 ignore_features=feature3"
+
+ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
+ expect(Yast::InstFunctions.feature_ignored?("f-e-a-t-u-r-e-2")).to be_true
+ end
+
+ it "should be true if feature is set on commandline with dashes and
underscores" do
+ linuxrc_commandline = "trash=install ignore_features=feature1
ignored_features=feature2 ignore_features=feature3"
+
+ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
+ expect(Yast::InstFunctions.feature_ignored?("f-e-a-t-u-r-e_2")).to be_true
+ end
+
+ it "should be false if feature is not set on commandline" do
+ linuxrc_commandline = "trash=install ignore_features=feature1
ignored_features=feature2 ignore_features=feature3"
+
+ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
+ expect(Yast::InstFunctions.feature_ignored?("no-such-feature")).to be_false
+ end
+
+ it "should be false if feature to check is empty" do
+ linuxrc_commandline = "trash=install ignore_features=feature1
ignored_features=feature2 ignore_features=feature3"
+
+ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
+ expect(Yast::InstFunctions.feature_ignored?("")).to be_false
+ end
+
+ it "should be false if feature to check is undefined" do
+ linuxrc_commandline = "trash=install ignore_features=feature1
ignored_features=feature2 ignore_features=feature3"
+
+ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
+ expect(Yast::InstFunctions.feature_ignored?(nil)).to be_false
+ end
+end
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
