[packages/composer] ignore svn externals when checking out vendors

glen glen at pld-linux.org
Thu Sep 10 12:58:24 CEST 2015


commit 833eb7f2e0149583d7164edbefa487fc32625239
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Sep 10 13:56:51 2015 +0300

    ignore svn externals when checking out vendors
    
    https://github.com/composer/composer/issues/4283

 composer.spec              |  4 +++-
 svn-ignore-externals.patch | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/composer.spec b/composer.spec
index e83ee7d..f1df445 100644
--- a/composer.spec
+++ b/composer.spec
@@ -4,7 +4,7 @@
 # Conditional build:
 %bcond_with	bootstrap		# build boostrap
 
-%define		rel		13
+%define		rel		14
 #define		githash	5744981
 # $ git rev-list 1.0.0-alpha10..%{githash} --count
 #define		commits	216
@@ -30,6 +30,7 @@ Patch0:		nogit.patch
 Patch1:		no-vendors.patch
 Patch2:		autoload-config.patch
 Patch3:		update-memory-limit.patch
+Patch4:		svn-ignore-externals.patch
 URL:		http://www.getcomposer.org/
 BuildRequires:	%{php_name}-cli
 BuildRequires:	%{php_name}-ctype
@@ -104,6 +105,7 @@ mv composer-*/* .
 %patch0 -p1
 %{!?with_bootstrap:%patch1 -p1}
 %patch3 -p1
+%patch4 -p1
 
 mv composer.lock{,.disabled}
 # NOTE: do not use %{__php} macro here, need unversioned php binary
diff --git a/svn-ignore-externals.patch b/svn-ignore-externals.patch
new file mode 100644
index 0000000..726be5d
--- /dev/null
+++ b/svn-ignore-externals.patch
@@ -0,0 +1,11 @@
+--- composer-1.0.0-13.alpha10/src/Composer/Downloader/SvnDownloader.php~	2015-04-15 00:18:51.000000000 +0300
++++ composer-1.0.0-13.alpha10/src/Composer/Downloader/SvnDownloader.php	2015-09-02 21:37:14.936187207 +0300
+@@ -156,7 +156,7 @@
+             $fromRevision = preg_replace('{.*@(\d+)$}', '$1', $fromReference);
+             $toRevision = preg_replace('{.*@(\d+)$}', '$1', $toReference);
+ 
+-            $command = sprintf('svn log -r%s:%s --incremental', $fromRevision, $toRevision);
++            $command = sprintf('svn log -r%s:%s --incremental --ignore-externals', $fromRevision, $toRevision);
+ 
+             if (0 !== $this->process->execute($command, $output, $path)) {
+                 throw new \RuntimeException(
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/composer.git/commitdiff/833eb7f2e0149583d7164edbefa487fc32625239



More information about the pld-cvs-commit mailing list