Hello community,
here is the log from the commit of package yast2-nfs-client for
openSUSE:Factory checked in at 2013-11-15 08:39:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-nfs-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-nfs-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-nfs-client"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-nfs-client/yast2-nfs-client.changes
2013-10-11 11:07:58.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-nfs-client.new/yast2-nfs-client.changes
2013-11-15 08:39:52.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Nov 11 17:43:04 CET 2013 - loci...@suse.com
+
+- Added missing mount options (bnc#848768)
+- Refactored NfsOptions library
+- 3.1.1
+
+-------------------------------------------------------------------
Old:
----
yast2-nfs-client-3.1.0.tar.bz2
New:
----
yast2-nfs-client-3.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nfs-client.spec ++++++
--- /var/tmp/diff_new_pack.jVW0GH/_old 2013-11-15 08:39:52.000000000 +0100
+++ /var/tmp/diff_new_pack.jVW0GH/_new 2013-11-15 08:39:52.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-nfs-client
-Version: 3.1.0
+Version: 3.1.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -33,6 +33,7 @@
# Support was checked against nfs-utils 1.2.7.
# As soon as nfs-utils reaches version 1.2.9 there should be another update.
BuildRequires: nfs-client < 1.2.9
+BuildRequires: rubygem-rspec
#ag_showexports moved to yast2 base
# introduces extended IPv6 support.
Requires: yast2 >= 2.23.6
++++++ yast2-nfs-client-3.1.0.tar.bz2 -> yast2-nfs-client-3.1.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-client-3.1.0/CONTRIBUTING.md
new/yast2-nfs-client-3.1.1/CONTRIBUTING.md
--- old/yast2-nfs-client-3.1.0/CONTRIBUTING.md 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-nfs-client-3.1.1/CONTRIBUTING.md 2013-11-12 16:32:51.000000000
+0100
@@ -0,0 +1,87 @@
+YaST Contribution Guidelines
+============================
+
+YaST is an open source project and as such it welcomes all kinds of
+contributions. If you decide to contribute, please follow these guidelines to
+ensure the process is effective and pleasant both for you and YaST maintainers.
+
+There are two main forms of contribution: reporting bugs and performing code
+changes.
+
+Bug Reports
+-----------
+
+If you find a problem, please report it either using
+[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2)
+or [GitHub issues](../../issues). (For Bugzilla, use the [simplified
+registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp)
+if you don't have an account yet.)
+
+If you find a problem, please report it either using
+[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee
+that every bug will be fixed, but we'll try.
+
+When creating a bug report, please follow our [bug reporting
+guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug).
+
+Code Changes
+------------
+
+We welcome all kinds of code contributions, from simple bug fixes to
significant
+refactorings and implementation of new features. However, before making any
+non-trivial contribution, get in touch with us first — this can prevent wasted
+effort on both sides. Also, have a look at our [development
+documentation](http://en.opensuse.org/openSUSE:YaST_development).
+
+To send us your code change, use GitHub pull requests. The workflow is as
+follows:
+
+ 1. Fork the project.
+
+ 2. Create a topic branch based on `master`.
+
+ 3. Implement your change, including tests (if possible). Make sure you adhere
+ to the [Ruby style
+ guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md).
+
+ 4. Make sure your change didn't break anything by building the RPM package
+ (`rake osc:build`). The build process includes running the full testsuite.
+
+ 5. Publish the branch and create a pull request.
+
+ 6. YaST developers will review your change and possibly point out issues.
+ Adapt the code under their guidance until they are all resolved.
+
+ 7. Finally, the pull request will get merged or rejected.
+
+See also [GitHub's guide on
+contributing](https://help.github.com/articles/fork-a-repo).
+
+If you want to do multiple unrelated changes, use separate branches and pull
+requests.
+
+Do not change the `VERSION` and `*.changes` files as this could lead to
+conflicts.
+
+### Commits
+
+Each commit in the pull request should do only one thing, which is clearly
+described by its commit message. Especially avoid mixing formatting changes and
+functional changes into one commit. When writing commit messages, adhere to
+[widely used
+conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+
+If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure
+you mention it in the commit message for cross-reference. Use format like
+bnc#775814 or gh#yast/yast-foo#42. See also [GitHub
+autolinking](https://help.github.com/articles/github-flavored-markdown#references)
+and [openSUSE abbreviation
+reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations).
+
+Additional Information
+----------------------
+
+If you have any question, feel free to ask at the [development mailing
+list](http://lists.opensuse.org/yast-devel/) or at the
+[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode.
+We'll do our best to provide a timely and accurate answer.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-client-3.1.0/COPYING
new/yast2-nfs-client-3.1.1/COPYING
--- old/yast2-nfs-client-3.1.0/COPYING 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-nfs-client-3.1.1/COPYING 2013-11-12 16:32:51.000000000 +0100
@@ -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-nfs-client-3.1.0/VERSION
new/yast2-nfs-client-3.1.1/VERSION
--- old/yast2-nfs-client-3.1.0/VERSION 2013-10-08 12:58:18.000000000 +0200
+++ new/yast2-nfs-client-3.1.1/VERSION 2013-11-12 16:32:51.000000000 +0100
@@ -1 +1 @@
-3.1.0
+3.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nfs-client-3.1.0/package/yast2-nfs-client.changes
new/yast2-nfs-client-3.1.1/package/yast2-nfs-client.changes
--- old/yast2-nfs-client-3.1.0/package/yast2-nfs-client.changes 2013-10-08
12:58:18.000000000 +0200
+++ new/yast2-nfs-client-3.1.1/package/yast2-nfs-client.changes 2013-11-12
16:32:51.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Nov 11 17:43:04 CET 2013 - loci...@suse.com
+
+- Added missing mount options (bnc#848768)
+- Refactored NfsOptions library
+- 3.1.1
+
+-------------------------------------------------------------------
Thu Sep 26 11:31:10 UTC 2013 - lsle...@suse.cz
- do not use *.spec.in template, use *.spec file with RPM macros
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-client-3.1.0/package/yast2-nfs-client.spec
new/yast2-nfs-client-3.1.1/package/yast2-nfs-client.spec
--- old/yast2-nfs-client-3.1.0/package/yast2-nfs-client.spec 2013-10-08
12:58:18.000000000 +0200
+++ new/yast2-nfs-client-3.1.1/package/yast2-nfs-client.spec 2013-11-12
16:32:51.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-nfs-client
-Version: 3.1.0
+Version: 3.1.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -33,6 +33,7 @@
# Support was checked against nfs-utils 1.2.7.
# As soon as nfs-utils reaches version 1.2.9 there should be another update.
BuildRequires: nfs-client < 1.2.9
+BuildRequires: rubygem-rspec
#ag_showexports moved to yast2 base
# introduces extended IPv6 support.
Requires: yast2 >= 2.23.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-client-3.1.0/src/modules/NfsOptions.rb
new/yast2-nfs-client-3.1.1/src/modules/NfsOptions.rb
--- old/yast2-nfs-client-3.1.0/src/modules/NfsOptions.rb 2013-10-08
12:26:34.000000000 +0200
+++ new/yast2-nfs-client-3.1.1/src/modules/NfsOptions.rb 2013-11-12
16:32:51.000000000 +0100
@@ -4,41 +4,6 @@
module Yast
class NfsOptionsClass < Module
- def main
- textdomain "nfs"
- end
-
- # Parse to an internal representation:
- # Simply split by commas, but "defaults" is represented by the empty list
- # @param [String] options a fstab option string
- # @return [Array] of individual options
- def from_string(options)
- options = "" if options == "defaults"
- Builtins.splitstring(options, ",")
- end
-
- # Convert list of individual options to a fstab option string
- # @param [Array<String>] option_list list of individual options
- # @return a fstab option string
- def to_string(option_list)
- option_list = deep_copy(option_list)
- options = Builtins.mergestring(option_list, ",")
- options = "defaults" if options == ""
- options
- end
-
- # Checks the nfs options for /etc/fstab:
- # nonempty, comma separated list of foo,nofoo,bar=baz (see nfs(5))
- # @param [String] options options
- # @return a translated string with error message, emtpy string if
ok
- def validate(options)
- # To translators: error popup
- if Builtins.size(options) == 0
- return _("Empty option strings are not allowed.")
- end
-
- option_list = from_string(options)
-
# The options should be kept synced with the code that handles them,
# which is not an easy task, as there are many places:
# - util-linux.rpm
@@ -50,121 +15,153 @@
# - kernel: fs/nfs/super.c
#
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=history;f=fs/nfs/super.c
# Note that minorversion in particular is mentioned only in the kernel
- # but not in nfs-utils. WTF.
+ # but not in nfs-utils.
# these can be negated by "no"
- _NEGATABLE_OPTIONS = [
- "bg",
- "fg",
- "soft",
- "hard",
- "intr",
- "posix",
- "cto",
+ NEGATABLE_OPTIONS = [
"ac",
"acl",
- "lock",
- "tcp",
- "udp",
- "rdirplus",
- # these are common for all fs types
"atime",
"auto",
+ "bg",
+ "cto",
"dev",
+ "diratime",
"exec",
+ "fg",
"group",
+ "hard",
+ "intr",
+ "iversion",
+ "lock",
+ "mand",
"owner",
+ "posix",
+ "rdirplus",
+ "relatime",
+ "soft",
+ "strictatime",
"suid",
+ "tcp",
+ "udp",
"user",
"users"
]
- _NEGATED_OPTIONS = Builtins.maplist(_NEGATABLE_OPTIONS) do |e|
- Builtins.sformat("no%1", e)
- end
+
+ NEGATED_OPTIONS = NEGATABLE_OPTIONS.map{ |o| "no#{o}" }
# these cannot be negated
# they are not nfs specific BTW
- _SIMPLE_OPTIONS = [
- "defaults",
+ SIMPLE_OPTIONS = [
+ "_netdev",
"async",
- "sync",
+ "bind",
+ "defaults",
"dirsync",
+ "loud",
+ "nofail",
+ "owner",
+ "rbind",
+ "remount",
"ro",
"rw",
- "remount",
- "bind",
- "rbind",
- "_netdev"
+ "silent",
+ "sync"
]
- _OPTIONS_WITH_VALUE = [
- "rsize",
- "wsize",
- "timeo",
- "retrans",
- "acregmin",
- "acregmax",
+
+ OPTIONS_WITH_VALUE = [
+ "acdirmax",
"acdirmin",
"acdirmin",
- "acdirmax",
+ "acregmax",
+ "acregmin",
"actimeo",
- "retry",
- "namlen",
- "port",
- "proto",
"clientaddr",
- "mountport",
+ "context",
+ "defcontext",
+ "fscontext",
+ "minorversion",
"mounthost",
+ "mountport",
"mountprog",
"mountvers",
+ "namlen",
"nfsprog",
"nfsvers",
+ "port",
+ "proto",
+ "retrans",
+ "retry",
+ "rootcontext",
+ "rsize",
+ "sec",
+ "timeo",
"vers",
- "minorversion",
- "sec"
+ "wsize"
]
- # first fiter out non value options and its nooptions forms (see nfs(5))
- option_list = Builtins.filter(option_list) do |e|
- !Builtins.contains(_NEGATABLE_OPTIONS, e)
- end
- option_list = Builtins.filter(option_list) do |e|
- !Builtins.contains(_NEGATED_OPTIONS, e)
- end
- option_list = Builtins.filter(option_list) do |e|
- !Builtins.contains(_SIMPLE_OPTIONS, e)
+ def main
+ textdomain "nfs"
+ end
+
+ # Parse to an internal representation:
+ # Simply split by commas, but "defaults" is represented by the empty list
+ # @param [String] options a fstab option string
+ # @return [Array] of individual options
+ def from_string(options)
+ return [] if options == "defaults"
+
+ options.split(",")
+ end
+
+ # Convert list of individual options to a fstab option string
+ # @param [Array<String>] option_list list of individual options
+ # @return a fstab option string
+ def to_string(option_list)
+ return "defaults" if option_list.empty?
+
+ option_list.join(",")
+ end
+
+ def non_value_option?(option)
+ NEGATABLE_OPTIONS.include?(option) || NEGATED_OPTIONS.include?(option)
|| SIMPLE_OPTIONS.include?(option)
+ end
+
+ # Checks the nfs options for /etc/fstab:
+ # nonempty, comma separated list of foo,nofoo,bar=baz (see nfs(5))
+ # @param [String] options options
+ # @return a translated string with error message, emtpy string if
ok
+ def validate(options)
+ # To translators: error popup
+ if options.empty?
+ return _("Empty option strings are not allowed.")
end
error_message = ""
- Builtins.foreach(option_list) do |opt|
- opt_tuple = Builtins.splitstring(opt, "=")
- key = Ops.get(opt_tuple, 0, "")
- value = Ops.get(opt_tuple, 1, "")
- # By now we have filtered out known options without values;
- # so what is left is either unknown options, ...
- # FIXME: this also triggers for "intr=bogus"
- # because we should have considered '=' before the simple options
- # FIXME "'" + foo + "'" used not to break translations; merge it.
- if !Builtins.contains(_OPTIONS_WITH_VALUE, key)
+
+ from_string(options).each do |opt|
+ key, value, *rest = opt.split("=")
+
+ # Known options without any expected value
+ if non_value_option?(key)
+ next if value.nil?
+ # To translators: error popup
+ error_message = _("Unexpected value '#{value}' for option '#{key}'")
% { :value => value, :key => key }
+ # All unknown options
+ elsif ! OPTIONS_WITH_VALUE.include?(key)
# To translators: error popup
- error_message = Builtins.sformat(
- _("Unknown option: %1"),
- Ops.add(Ops.add("'", key), "'")
- )
- # ... or known ones with badly specified values
- elsif Builtins.size(opt_tuple) != 2
+ error_message = _("Unknown option: '%{key}'") % { :key => key }
+ # All known ones with badly specified values
+ elsif !rest.empty?
# To translators: error popup
- error_message = Builtins.sformat(
- _("Invalid option: %1"),
- Ops.add(Ops.add("'", opt), "'")
- )
- elsif value == ""
+ error_message = _("Invalid option: '%{opt}'") % { :opt => opt }
+ # All options missing a value
+ elsif value.nil?
# To translators: error popup
- error_message = Builtins.sformat(
- _("Empty value for option: %1"),
- Ops.add(Ops.add("'", key), "'")
- )
+ error_message = _("Empty value for option: '%{key}'") % { :key =>
key }
end
- raise Break if error_message != ""
+
+ break unless error_message.empty?
end
error_message
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-nfs-client-3.1.0/test/Makefile.am
new/yast2-nfs-client-3.1.1/test/Makefile.am
--- old/yast2-nfs-client-3.1.0/test/Makefile.am 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-nfs-client-3.1.1/test/Makefile.am 2013-11-12 16:32:51.000000000
+0100
@@ -0,0 +1,7 @@
+TESTS = \
+ nfs_options_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-nfs-client-3.1.0/test/nfs_options_test.rb
new/yast2-nfs-client-3.1.1/test/nfs_options_test.rb
--- old/yast2-nfs-client-3.1.0/test/nfs_options_test.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-nfs-client-3.1.1/test/nfs_options_test.rb 2013-11-12
16:32:51.000000000 +0100
@@ -0,0 +1,74 @@
+#! /usr/bin/env rspec
+
+ENV["Y2DIR"] = File.expand_path("../../src", __FILE__)
+
+require "yast"
+
+Yast.import "NfsOptions"
+
+describe "#validate" do
+ it "returns empty string on correct options" do
+ [
+ "defaults",
+ "nolock,bg",
+ "nolock,nobg",
+ "nolock,rsize=8192",
+ "defaults,ro,noatime,nodiratime,users,exec"
+ ].each do |options|
+ returned = Yast::NfsOptions.validate(options)
+ expect(returned).to be_empty, "options '#{options}' returned
'#{returned}'"
+ end
+ end
+
+ it "returns 'Empty option strings are not allowed' error message on empty
options" do
+ returned = Yast::NfsOptions.validate("")
+ expect(returned).to start_with("Empty option strings are not allowed"),
"options '' returned '#{returned}'"
+ end
+
+ it "returns 'Empty value' error message on options that expect key=value and
the value is empty" do
+ [
+ "noatime,port=",
+ "mountvers=",
+ "mountvers,=port=23",
+ "nolock,rsize=",
+ ].each do |options|
+ returned = Yast::NfsOptions.validate(options)
+ expect(returned).to start_with("Empty value"), "options '#{options}'
returned '#{returned}'"
+ end
+ end
+
+ it "returns 'Unexpected value' error message on options that do not expect
key=value but some value is present" do
+ [
+ "nolock,intr=bogus",
+ "nosuid=true",
+ ].each do |options|
+ returned = Yast::NfsOptions.validate(options)
+ expect(returned).to start_with("Unexpected value"), "options
'#{options}' returned '#{returned}'"
+ end
+ end
+
+ it "returns 'Invalid option' error message on options that expect key=value
and the value contains '='" do
+ [
+ "noatime,port=dort=fort",
+ "mountvers=port=23",
+ "nolock,retrans=trans=trans",
+ ].each do |options|
+ returned = Yast::NfsOptions.validate(options)
+ expect(returned).to start_with("Invalid option"), "options '#{options}'
returned '#{returned}'"
+ end
+ end
+
+ it "returns 'Unknown option' error message on options that are unknown" do
+ [
+ "noatime,unknownparam",
+ "mountvers2",
+ "nolock, bg",
+ "nolock,unknownoption",
+ "nolock,unknownassignment=true",
+ "nolock,two=equal=signs",
+ ].each do |options|
+ returned = Yast::NfsOptions.validate(options)
+ expect(returned).to start_with("Unknown option"), "options '#{options}'
returned '#{returned}'"
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-nfs-client-3.1.0/testsuite/tests/nfs-options.out
new/yast2-nfs-client-3.1.1/testsuite/tests/nfs-options.out
--- old/yast2-nfs-client-3.1.0/testsuite/tests/nfs-options.out 2013-10-08
12:26:34.000000000 +0200
+++ new/yast2-nfs-client-3.1.1/testsuite/tests/nfs-options.out 2013-11-12
16:32:51.000000000 +0100
@@ -10,6 +10,6 @@
Return Empty value for option: 'rsize'
Return Unknown option: 'two'
Return Invalid option: 'retrans=trans=trans'
-Return Unknown option: 'intr'
+Return Unexpected value 'bogus' for option 'intr'
Dump NfsOptions::get_nfs41
Dump NfsOptions::set_nfs41
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
