Add "AND CONTRIBUTORS" to options.py license

From https://groups.google.com/d/msg/bup-list/8lcxXuXilTE/JC9rm69oAQAJ

  From: Avery Pennarun <apenwarr@gmail.com>
  Date: Sun, 25 Mar 2018 21:35:58 -0400
  Message-ID: <CAHqTa-2LB2mqscnzZmmixeTbR86BPh=FTk3UyGQKjPwaQPrZ3g@mail.gmail.com>
  Subject: Re: bupsplit.c copyright and patching
  To: Rob Browning <rlb@defaultvalue.org>
  Cc: Robert Evans <evansr@google.com>, bup-list <bup-list@googlegroups.com>
  On Sun, Mar 25, 2018 at 1:48 PM, Rob Browning <rlb@defaultvalue.org> wrote:
  > Avery Pennarun <apenwarr@gmail.com> writes:
  >> On Sun, Mar 18, 2018 at 11:52 AM, Rob Browning <rlb@defaultvalue.org> wrote:
  >>> Avery Pennarun <apenwarr@gmail.com> writes:
  >>> So for the record, it sounds like you approve of changing the relevant
  >>> bupsplit.h and bupsplit.c phrase to this?
  >>>
  >>>   THIS SOFTWARE IS PROVIDED BY AVERY PENNARUN AND CONTRIBUTORS``AS IS'' AND ANY
  >>
  >> Yes, that's fine.
  >
  > And perhaps you'd approve of making the same change to options.py as
  > well?

  Good idea.  Let's do that :)

Signed-off-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lib/bup/options.py b/lib/bup/options.py
index 394b71daed2311e9417cd97353e9b12975b7b288..37c76aa0f59ad742ade60833382ca4d8d0f131e8 100644 (file)
--- a/lib/bup/options.py
+++ b/lib/bup/options.py
@@ -16,17 +16,18 @@
 #       the documentation and/or other materials provided with the
 #       distribution.
 #
-# THIS SOFTWARE IS PROVIDED BY AVERY PENNARUN ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY AVERY PENNARUN AND CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+# <COPYRIGHT HOLDER> OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 """Command-line options parser.
 With the help of an options spec string, easily parse command-line options.