Attachment 231213 Details for Bug 261220 – Remove duplication in patch files

[patch] Remove duplication in patch files

0001-Remove-code-duplication-in-patches.patch (text/plain), 4.08 KB, created by Angelo Polo on 2022-01-21 14:19:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Angelo Polo

Created: 2022-01-21 14:19:47 UTC

Size: 4.08 KB

patch

obsolete

>From fc2d4852364115bcf42ebd52afbea8c5e103ba98 Mon Sep 17 00:00:00 2001
>From: Angelo Polo <language.devel@gmail.com>
>Date: Fri, 21 Jan 2022 16:12:53 +0100
>Subject: [PATCH] Remove code duplication in patches
>
>---
> .../files/patch-.build_build-resolver.xml     | 27 -------------------
> .../files/patch-pylib_requirements.txt        | 16 -----------
> 2 files changed, 43 deletions(-)
>
>diff --git a/databases/cassandra3/files/patch-.build_build-resolver.xml b/databases/cassandra3/files/patch-.build_build-resolver.xml
>index e037610af9e9..2629ddab11c9 100644
>--- a/databases/cassandra3/files/patch-.build_build-resolver.xml
>+++ b/databases/cassandra3/files/patch-.build_build-resolver.xml
>@@ -25,30 +25,3 @@
> -</project>
> \ No newline at end of file
> +</project>
>---- .build/build-resolver.xml.orig	2022-01-03 17:11:14 UTC
>-+++ .build/build-resolver.xml
>-@@ -182,7 +182,7 @@
>- 
>-         
>-         <get src="https://files.pythonhosted.org/packages/59/a0/cf4cd997e1750f0c2d91c6ea5abea218251c43c3581bcc2f118b00baf5cf/futures-2.1.6-py2.py3-none-any.whl" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
>--        <get src="https://files.pythonhosted.org/packages/2e/a4/6dcb84af409b7bc0c258a0d6bd7e14231724d9a46b750c048f09d74d870c/six-1.7.3-py2.py3-none-any.whl" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.7.3-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
>-+        <get src="https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl" dest="${localm2}/org/apache/cassandra/deps/six-1.16.0-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
>- 
>-         
>-         <get src="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip" dest="${user.home}/.m2/repository/org/apache/cassandra/deps/cassandra-driver-internal-only-3.11.0-bb96859b.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
>-@@ -216,7 +216,7 @@
>-         <copy todir="${build.lib}" quiet="true">
>-             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip"/>
>-             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/cassandra-driver-internal-only-3.11.0-bb96859b.zip"/>
>--            <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.7.3-py2.py3-none-any.zip"/>
>-+            <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/six-1.16.0-py2.py3-none-any.zip"/>
>-         </copy>
>-         <copy todir="${build.lib}/sigar-bin/" quiet="true">
>-             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-freebsd-6.so"/>
>-@@ -243,4 +243,4 @@
>-             <file file="${user.home}/.m2/repository/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.lib"/>
>-         </copy>
>-     </target>
>--</project>
>-\ No newline at end of file
>-+</project>
>diff --git a/databases/cassandra3/files/patch-pylib_requirements.txt b/databases/cassandra3/files/patch-pylib_requirements.txt
>index 4468f4611060..27616df2d111 100644
>--- a/databases/cassandra3/files/patch-pylib_requirements.txt
>+++ b/databases/cassandra3/files/patch-pylib_requirements.txt
>@@ -14,19 +14,3 @@
>  psutil
> -thrift==0.9.3
> +thrift==0.10.0
>---- pylib/requirements.txt.orig	2022-01-04 12:21:36 UTC
>-+++ pylib/requirements.txt
>-@@ -1,7 +1,6 @@
>- # See python driver docs: futures and six have to be installed before
>- # cythonizing the driver, perhaps only on old pips.
>- # http://datastax.github.io/python-driver/installation.html#cython-based-extensions
>--futures
>- six>=0.12.0
>- -e git+https://github.com/datastax/python-driver.git@cassandra-test#egg=cassandra-driver
>- # Used ccm version is tracked by cassandra-test branch in ccm repo. Please create a PR there for fixes or upgrades to new releases.
>-@@ -17,4 +16,4 @@ nose-test-select
>- parse
>- pycodestyle
>- psutil
>--thrift==0.9.3
>-+thrift==0.10.0
>-- 
>2.34.1
>

Flags:

language.devel: maintainer-approval+

Actions: View | Diff

Attachments on bug 261220: 231019 | 231213 | 231642