Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2013-10-25 11:37:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2013-10-14 09:32:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2013-10-25 11:37:59.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Oct 22 11:17:25 UTC 2013 - [email protected] + +- bnc#846550 + - deleting aliases works even for devices with name according + new scheme + +------------------------------------------------------------------- +Tue Oct 22 10:57:46 CEST 2013 - [email protected] + +- Added Linuxrc.keys (FATE#314982) +- 3.1.1 + +------------------------------------------------------------------- Old: ---- yast2-3.1.0.tar.bz2 New: ---- yast2-3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.sbbQ7O/_old 2013-10-25 11:38:14.000000000 +0200 +++ /var/tmp/diff_new_pack.sbbQ7O/_new 2013-10-25 11:38:14.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.0 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,11 +36,14 @@ BuildRequires: yast2-ycp-ui-bindings >= 2.18.4 # Needed for tests -BuildRequires: ruby +BuildRequires: rubygem-rspec # for symlinking yardoc duplicates BuildRequires: fdupes +# For running RSpec tests during build +BuildRequires: rubygem-rspec + # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq @@ -223,7 +226,6 @@ # documentation (not included in devel subpackage) %doc %dir %{yast_docdir} %doc %{yast_docdir}/COPYING -%doc %{yast_docdir}/README %doc %{_mandir}/*/* /sbin/* ++++++ yast2-3.1.0.tar.bz2 -> yast2-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.0/COPYING new/yast2-3.1.2/COPYING --- old/yast2-3.1.0/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.2/COPYING 2013-10-22 15:58:03.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-3.1.0/README.markdown new/yast2-3.1.2/README.markdown --- old/yast2-3.1.0/README.markdown 2013-10-11 16:11:48.000000000 +0200 +++ new/yast2-3.1.2/README.markdown 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -# YaST - The basic libraries # - -This repository contains basic set of shared libraries and so-called SCR agents -used for reading and writing configuration files and some even for executing -commands on the system. - -## Installation ## - - make -f Makefile.cvs - make - sudo make install - -## Running Testsuites ## - - make check - -## Links ## - - * See more at http://en.opensuse.org/openSUSE:YaST_development diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.0/README.md new/yast2-3.1.2/README.md --- old/yast2-3.1.0/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.2/README.md 2013-10-22 15:58:03.000000000 +0200 @@ -0,0 +1,19 @@ +# YaST - The basic libraries # + +This repository contains basic set of shared libraries and so-called SCR agents +used for reading and writing configuration files and some even for executing +commands on the system. + +## Installation ## + + make -f Makefile.cvs + make + sudo make install + +## Running Testsuites ## + + make check + +## Links ## + + * See more at http://en.opensuse.org/openSUSE:YaST_development diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.0/VERSION new/yast2-3.1.2/VERSION --- old/yast2-3.1.0/VERSION 2013-10-11 16:11:48.000000000 +0200 +++ new/yast2-3.1.2/VERSION 2013-10-22 15:58:03.000000000 +0200 @@ -1 +1 @@ -3.1.0 +3.1.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.0/library/general/Makefile.am new/yast2-3.1.2/library/general/Makefile.am --- old/yast2-3.1.0/library/general/Makefile.am 2013-10-11 16:11:48.000000000 +0200 +++ new/yast2-3.1.2/library/general/Makefile.am 2013-10-22 15:58:03.000000000 +0200 @@ -1,3 +1,3 @@ # Makefile.am for library/general -SUBDIRS = src testsuite +SUBDIRS = src testsuite test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.0/library/general/src/modules/Linuxrc.rb new/yast2-3.1.2/library/general/src/modules/Linuxrc.rb --- old/yast2-3.1.0/library/general/src/modules/Linuxrc.rb 2013-10-11 16:11:48.000000000 +0200 +++ new/yast2-3.1.2/library/general/src/modules/Linuxrc.rb 2013-10-22 15:58:03.000000000 +0200 @@ -43,6 +43,8 @@ # routines for reading data from /etc/install.inf def ReadInstallInf + return if @install_inf != nil + @install_inf = {} # don't read anything if the file doesn't exist if SCR.Read(path(".target.size"), "/etc/install.inf") == -1 @@ -70,8 +72,13 @@ end def InstallInf(key) - ReadInstallInf() if @install_inf == nil - Ops.get(@install_inf, key) + ReadInstallInf() + @install_inf[key] + end + + def keys + ReadInstallInf() + @install_inf.keys end # installation mode wrappers @@ -216,6 +223,7 @@ publish :function => :text, :type => "boolean ()" publish :function => :WriteYaSTInf, :type => "void (map <string, string>)" publish :function => :SaveInstallInf, :type => "boolean (string)" + publish :function => :keys, :type => "list <string> ()" end Linuxrc = LinuxrcClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.0/library/general/test/Makefile.am new/yast2-3.1.2/library/general/test/Makefile.am --- old/yast2-3.1.0/library/general/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.2/library/general/test/Makefile.am 2013-10-22 15:58:03.000000000 +0200 @@ -0,0 +1,7 @@ +TESTS = \ + linuxrc_test.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-3.1.0/library/general/test/linuxrc_test.rb new/yast2-3.1.2/library/general/test/linuxrc_test.rb --- old/yast2-3.1.0/library/general/test/linuxrc_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.2/library/general/test/linuxrc_test.rb 2013-10-22 15:58:03.000000000 +0200 @@ -0,0 +1,192 @@ +#! /usr/bin/env rspec + +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) + +require "yast" +include Yast + +Yast.import "Linuxrc" + +DEFAULT_INSTALL_INF = { + "Manual" => "0", + "Locale" => "xy_XY", + "Display" => "Color", + "HasPCMCIA" => "0", + "NoPCMCIA" => "0", + "Sourcemounted" => "1", + "SourceType" => "dir", + "RepoURL" => "cd:/?device=disk/by-id/ata-VBOX_CD-ROM_VB2-01700376", + "InstsysURL" => "boot/x86_64/root", + "ZyppRepoURL" => "cd:/?devices=/dev/disk/by-id/ata-VBOX_CD-ROM_VB2-01700376", + "InstMode" => "cd", + "Device" => "disk/by-id/ata-VBOX_CD-ROM_VB2-01700376", + "Cdrom" => "disk/by-id/ata-VBOX_CD-ROM_VB2-01700376", + "Partition" => "disk/by-id/ata-VBOX_CD-ROM_VB2-01700376", + "Serverdir" => "/", + "InitrdModules" => "ata_piix ata_generic cdrom sr_mod st sg thermal_sys thermal", + "Options" => "thermal tzp=50", + "UpdateDir" => "/linux/suse/x86_64-13.1", + "YaST2update" => "0", + "Textmode" => "0", + "MemFree" => "989888", + "VNC" => "0", + "UseSSH" => "0", + "InitrdID" => "2013-09-17.8c48b884", + "WithiSCSI" => "0", + "WithFCoE" => "0", + "StartShell" => "0", + "Y2GDB" => "0", + "kexec_reboot" => "1", + "UseSax2" => "0", + "EFI" => "0", + "Ignored_featureS" => "import_ssh_keys,import_users", + "Cmdline" => "splash=silent vga=0x314", + "Keyboard" => "1", + "Framebuffer" => "0x0314", + "X11i" => "", + "XServer" => "fbdev", + "XVersion" => "4", + "XBusID" => "0:2:0", + "XkbRules" => "xfree86", + "XkbModel" => "pc104", + "umount_result" => "0", +} + +def load_install_inf(defaults_replacement={}) + # Default value + SCR.stub(:Read).and_return nil + + SCR.stub(:Read) + .with(path(".target.size")) + .and_return 1 + + # Default value + SCR.stub(:Dir).and_return nil + + install_inf = DEFAULT_INSTALL_INF.merge(defaults_replacement) + + SCR.stub(:Dir) + .with(path(".etc.install_inf")) + .and_return install_inf.keys + + install_inf.keys.each do |key| + Yast::SCR.stub(:Read) + .with(path(".etc.install_inf.#{key}")) + .and_return install_inf[key] + end +end + +describe "Linuxrc" do + + before(:each) do + Linuxrc.ResetInstallInf + end + + describe "#serial_console" do + it "returns true if 'Console' is found in install.inf" do + load_install_inf("Console" => "/dev/console") + expect(Linuxrc.serial_console).to be_true + end + + it "returns false if 'Console' is not found in install.inf" do + load_install_inf("Console" => nil) + expect(Linuxrc.serial_console).to be_false + end + end + + describe "#braille" do + it "returns true if 'Braille' is found in install.inf" do + load_install_inf("Braille" => "/dev/braille") + expect(Linuxrc.braille).to be_true + end + + it "returns false if 'Braille' is not found in install.inf" do + load_install_inf("Braille" => nil) + expect(Linuxrc.braille).to be_false + end + end + + describe "#vnc" do + it "returns true if 'VNC' is set to '1' in install.inf" do + load_install_inf("VNC" => "1") + expect(Linuxrc.vnc).to be_true + end + + it "returns false if 'VNC' is not set to '1' in install.inf" do + load_install_inf("VNC" => "0") + expect(Linuxrc.vnc).to be_false + end + end + + describe "#display_ip" do + it "returns true if 'Display_IP' is found in install.inf" do + load_install_inf("Display_IP" => "1.2.3.4") + expect(Linuxrc.display_ip).to be_true + end + + it "returns false if 'Display_IP' is not found in install.inf" do + load_install_inf("Display_IP" => nil) + expect(Linuxrc.display_ip).to be_false + end + end + + describe "#usessh" do + it "returns true if 'UseSSH' is set to '1' in install.inf" do + load_install_inf("UseSSH" => "1") + expect(Linuxrc.usessh).to be_true + end + + it "returns false if 'UseSSH' is not set to '1' in install.inf" do + load_install_inf("UseSSH" => "0") + expect(Linuxrc.usessh).to be_false + end + end + + describe "#useiscsi" do + it "returns true if 'WithiSCSI' is set to '1' in install.inf" do + load_install_inf("WithiSCSI" => "1") + expect(Linuxrc.useiscsi).to be_true + end + + it "returns false if 'WithiSCSI' is not set to '1' in install.inf" do + load_install_inf("WithiSCSI" => "0") + expect(Linuxrc.useiscsi).to be_false + end + end + + describe "#text" do + it "returns true if 'Textmode' is set to '1' in install.inf" do + load_install_inf("Textmode" => "1") + expect(Linuxrc.text).to be_true + end + + it "returns false if 'Textmode' is not set to '1' in install.inf" do + load_install_inf("Textmode" => "0") + expect(Linuxrc.text).to be_false + end + end + + describe "#InstallInf" do + it "returns locale defined in install.inf" do + load_install_inf + expect(Linuxrc.InstallInf("Locale")).to be_equal(DEFAULT_INSTALL_INF["Locale"]) + end + + it "returns nil if value for unknown key is requested" do + load_install_inf + expect(Linuxrc.InstallInf("Unknown Key Requested")).to be_nil + end + + it "returns nil if value for 'nil' key is requested" do + load_install_inf + expect(Linuxrc.InstallInf(nil)).to be_nil + end + end + + describe "#keys" do + it "returns all keys defined in install.inf" do + load_install_inf + expect(Linuxrc.keys.sort).to eq(DEFAULT_INSTALL_INF.keys.sort) + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.0/library/network/src/modules/NetworkInterfaces.rb new/yast2-3.1.2/library/network/src/modules/NetworkInterfaces.rb --- old/yast2-3.1.0/library/network/src/modules/NetworkInterfaces.rb 2013-10-11 16:11:48.000000000 +0200 +++ new/yast2-3.1.2/library/network/src/modules/NetworkInterfaces.rb 2013-10-22 15:58:03.000000000 +0200 @@ -35,6 +35,16 @@ module Yast class NetworkInterfacesClass < Module + + Yast.import "String" + + # A single character used to separate alias id + ALIAS_SEPARATOR = "#" + TYPE_REGEX = "(ip6tnl|mip6mnha|[#{String.CAlpha}]+)" + ID_REGEX = "([^#{ALIAS_SEPARATOR}]*)" + ALIAS_REGEX = "(.*)" + DEVNAME_REGEX = "#{TYPE_REGEX}-?#{ID_REGEX}" + def main textdomain "base" @@ -42,7 +52,6 @@ Yast.import "Map" Yast.import "Mode" Yast.import "Netmask" - Yast.import "String" Yast.import "TypeRepository" Yast.import "FileUtils" Yast.import "IP" @@ -140,46 +149,11 @@ # -------------------- components of configuration names -------------------- - # A single character used to separate alias id - @alias_separator = "#" - # ifcfg name = type + id + alias_id # If id is numeric, it is not separated from type, otherwise separated by "-" # Id may be empty # Alias_id, if nonempty, is separated by alias_separator - @ifcfg_name_regex = Ops.add( - Ops.add( - Ops.add( - Ops.add( - Ops.add( - Ops.add( - Ops.add( - Ops.add( - Ops.add( - Ops.add( - "^" + - # ip6: #48696 - "(ip6tnl|mip6mnha|[", - String.CAlpha - ), - "]+)" - ), - "-?" - ), - "([^" - ), - @alias_separator - ), - "]*)" - ), - @alias_separator - ), - "?" - ), - "(.*)" - ), - "$" - ) + @ifcfg_name_regex = "^#{DEVNAME_REGEX}#{ALIAS_SEPARATOR}?#{ALIAS_REGEX}$" # Translates type code exposed by kernel in sysfs onto internaly used dev types. @TypeBySysfs = { @@ -264,7 +238,7 @@ def ifcfg_part(ifcfg, part) return "" if Builtins.regexpmatch(ifcfg, @ifcfg_name_regex) != true - ret = Builtins.regexpsub(ifcfg, @ifcfg_name_regex, Ops.add("\\", part)) + ret = Builtins.regexpsub(ifcfg, @ifcfg_name_regex, "\\#{part}") ret == nil ? "" : ret end @@ -272,7 +246,7 @@ # @param [String] dev device # @return device type # @example device_type("eth1") -> "eth" - # @example device_type("eth-pcmcia-0") -> "eth-pcmcia" + # @example device_type("eth-pcmcia-0") -> "eth" def device_type(dev) ifcfg_part(dev, "1") end @@ -470,7 +444,10 @@ # @return device number # @example device_num("eth1") -> "1" # @example device_num("lo") -> "" + # + # Obsolete: It is incompatible with new device naming scheme. def device_num(dev) + Builtins.y2warning( "Do not use device_num.") ifcfg_part(dev, "2") end @@ -507,6 +484,13 @@ Builtins.sformat("%1-%2", typ, num) end + # Extracts device name from alias name + # + # alias_name := <device_name>{ALIAS_SEPARATOR}<alias_name> + def device_name_from_alias(alias_name) + alias_name.sub(/#{ALIAS_SEPARATOR}.*/, "") + end + # Create a alias name from its type and numbers # @param [String] typ device type # @param [String] num device number @@ -869,16 +853,15 @@ Builtins.y2debug("deleting: %1", p) SCR.Write(p, nil) else - typ = device_type(d) - num = device_num(d) - dev = device_name(typ, num) + dev = device_name_from_alias(d) + typ = GetType(dev) base = Builtins.add(path(".network.value"), dev) # look in OriginalDevs because we need to catch all variables # of the alias - Builtins.foreach( - Ops.get_map(_OriginalDevs, [typ, dev, "_aliases", anum], {}) - ) do |key, dummy| - p = Builtins.add(base, Ops.add(Ops.add(key, "_"), anum)) + + dev_aliases = _OriginalDevs[typ][dev]["_aliases"][anum] || {} + dev_aliases.keys.each do |key| + p = base + "#{key}_#{anum}" Builtins.y2debug("deleting: %1", p) SCR.Write(p, nil) end @@ -1860,22 +1843,6 @@ ret end - # Check if the given device has any virtual alias. - # @param dev device to be checked - # @return true if there are some aliases - def HasAliases(name) - if !Check(name) - Builtins.y2error("Device not found: %1", name) - return false - end - - t = device_type(name) - d = device_num(name) - a = alias_num(name) - - a == "" && Ops.get_map(@Devices, [t, d, "_aliases"], {}) != {} - end - # DSL needs to save its config while the underlying network card is # being configured. def Push @@ -1987,7 +1954,6 @@ publish :function => :List, :type => "list <string> (string)" publish :function => :Fastest, :type => "string ()" publish :function => :FastestType, :type => "string (string)" - publish :function => :HasAliases, :type => "boolean (string)" publish :function => :Push, :type => "void ()" publish :function => :Pop, :type => "void ()" publish :function => :ValidCharsIfcfg, :type => "string ()" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.0/library/network/test/Makefile.am new/yast2-3.1.2/library/network/test/Makefile.am --- old/yast2-3.1.0/library/network/test/Makefile.am 2013-10-11 16:11:48.000000000 +0200 +++ new/yast2-3.1.2/library/network/test/Makefile.am 2013-10-22 15:58:03.000000000 +0200 @@ -1,5 +1,8 @@ -TESTS = load_ipv6_cfg_test.rb +TESTS = \ + load_ipv6_cfg_test.rb \ + network_interfaces_helpers_test.rb + TEST_EXTENSIONS = .rb -RB_LOG_COMPILER = ruby +RB_LOG_COMPILER = rspec VERBOSE = 1 EXTRA_DIST = $(TESTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.0/library/network/test/load_ipv6_cfg_test.rb new/yast2-3.1.2/library/network/test/load_ipv6_cfg_test.rb --- old/yast2-3.1.0/library/network/test/load_ipv6_cfg_test.rb 2013-10-11 16:11:48.000000000 +0200 +++ new/yast2-3.1.2/library/network/test/load_ipv6_cfg_test.rb 2013-10-22 15:58:03.000000000 +0200 @@ -1,7 +1,8 @@ -#! /usr/bin/env ruby +#! /usr/bin/env rspec -require "minitest/spec" -require "minitest/autorun" +inc_dirs = Dir.glob("../../../library/*/src") +inc_dirs.map { |inc_dir| File.expand_path(inc_dir, __FILE__) } +ENV["Y2DIR"] = inc_dirs.join(":") require "yast" @@ -23,11 +24,15 @@ } ] -describe "When reading devices configuration with IPv6 setup" do - it "Sets ipaddr, prefix and empty mask" do - IPV6_IFCFG.each do |ipv6_ifcfg| - canonical_ifcfg = Yast::NetworkInterfaces.CanonicalizeIP( ipv6_ifcfg[ :data]) - canonical_ifcfg.must_equal( ipv6_ifcfg[ :expected]) +describe Yast::NetworkInterfaces do + context "Handling IPv6 address" do + describe "#CanonicalizeIP" do + it "Sets ipaddr, prefix and empty mask" do + IPV6_IFCFG.each do |ipv6_ifcfg| + canonical_ifcfg = Yast::NetworkInterfaces.CanonicalizeIP( ipv6_ifcfg[ :data]) + expect( canonical_ifcfg).to be_eql( ipv6_ifcfg[ :expected]) + end + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.0/library/network/test/network_interfaces_helpers_test.rb new/yast2-3.1.2/library/network/test/network_interfaces_helpers_test.rb --- old/yast2-3.1.0/library/network/test/network_interfaces_helpers_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.2/library/network/test/network_interfaces_helpers_test.rb 2013-10-22 15:58:03.000000000 +0200 @@ -0,0 +1,71 @@ +#!/usr/bin/env rspec + +inc_dirs = Dir.glob("../../../library/*/src") +inc_dirs.map { |inc_dir| File.expand_path(inc_dir, __FILE__) } +ENV["Y2DIR"] = inc_dirs.join(":") + +require "yast" + +Yast.import("NetworkInterfaces") + +module Yast + + describe NetworkInterfaces do + + context "Parsing device name" do + + DEVICE_DESCS = [ + { + name: "", + alias_id: "", + type_by_regex: "" + }, + { + name: "eth0", + alias_id: "", + type_by_regex: "eth" + }, + { + name: "eth-pcmcia-0", + alias_id: "", + type_by_regex: "eth" + }, + { + name: "enp0s3", + alias_id: "", + type_by_regex: "enp" + }, + { + name: "eth0#1", + alias_id: "1", + type_by_regex: "eth" + }, + { + name: "enp0s3#0", + alias_id: "0", + type_by_regex: "enp" + } + ] + + DEVICE_DESCS.each do |device_desc| + + device_name = device_desc[:name] + alias_id = device_desc[:alias_id] + type_by_regex = device_desc[:type_by_regex] + + describe '#alias_num' do + + it "returns alias_id: <#{alias_id}> for name: <#{device_name}>" do + expect(NetworkInterfaces.alias_num(device_name)).to be_eql alias_id + end + end + + describe "#device_type" do + it "returns type by regex: <#{type_by_regex}> for name: <#{device_name}>" do + expect(NetworkInterfaces.device_type(device_name)).to be_eql type_by_regex + end + end + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.0/package/yast2.changes new/yast2-3.1.2/package/yast2.changes --- old/yast2-3.1.0/package/yast2.changes 2013-10-11 16:11:49.000000000 +0200 +++ new/yast2-3.1.2/package/yast2.changes 2013-10-22 15:58:03.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue Oct 22 11:17:25 UTC 2013 - [email protected] + +- bnc#846550 + - deleting aliases works even for devices with name according + new scheme + +------------------------------------------------------------------- +Tue Oct 22 10:57:46 CEST 2013 - [email protected] + +- Added Linuxrc.keys (FATE#314982) +- 3.1.1 + +------------------------------------------------------------------- Wed Oct 9 13:45:40 UTC 2013 - [email protected] - Install binaries to /usr/sbin instead of /sbin to be consistent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.0/package/yast2.spec new/yast2-3.1.2/package/yast2.spec --- old/yast2-3.1.0/package/yast2.spec 2013-10-11 16:11:49.000000000 +0200 +++ new/yast2-3.1.2/package/yast2.spec 2013-10-22 15:58:03.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.0 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -33,11 +33,14 @@ BuildRequires: yast2-core >= 2.18.12 yast2-pkg-bindings >= 2.20.3 yast2-ycp-ui-bindings >= 2.18.4 # Needed for tests -BuildRequires: ruby +BuildRequires: rubygem-rspec # for symlinking yardoc duplicates BuildRequires: fdupes +# For running RSpec tests during build +BuildRequires: rubygem-rspec + # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq @@ -211,7 +214,6 @@ # documentation (not included in devel subpackage) %doc %dir %{yast_docdir} %doc %{yast_docdir}/COPYING -%doc %{yast_docdir}/README %doc %{_mandir}/*/* /sbin/* -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
