Skip to contentSkip to conversation

pkg-download: fix svn download for deleted path

PATCH New Ryan Barnett 3 participants 3 messages Jun 26, 2014 – Jun 29, 2014

lore
Share & tools
lore

Ryan Barnett

author
#0 lore raw

PATCH 1/1 pkg-download: fix svn download for deleted path

If a SVN path has been deleted in a future revision, downloading a package's source will fail using 'svn checkout -r'. Fix using URL at REV syntax since the SVN command will then verify the path at the specified version. Without using the URL at REV syntax, the SVN command will attempt to verify the path exists on the the HEAD revision before checking out the path at the specified revision.

Error seen if SVN path has been deleted in HEAD using svn checkout -r:
svn: E160013: '/svn/path/' path not found

Signed-off-by Ryan Barnett <[email protected]>
---
 package/pkg-download.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/pkg-download.mk +2 -2
index 4cfb913..e07fd1b 100644
@@ -145,14 +145,14 @@ endef
 define DOWNLOAD_SVN
 	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
 	(pushd $(DL_DIR) > /dev/null && \
-	$(SVN) export -r $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_DL_DIR) && \
+	$(SVN) export $($(PKG)_SITE)@$($(PKG)_DL_VERSION) $($(PKG)_DL_DIR) && \
 	$(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME)/ && \
 	rm -rf $($(PKG)_DL_DIR) && \
 	popd > /dev/null)
 endef
 
 define SOURCE_CHECK_SVN
-  $(SVN) ls $($(PKG)_SITE) > /dev/null
+  $(SVN) ls $($(PKG)_SITE)@$($(PKG)_DL_VERSION) > /dev/null
 endef
 
 define SHOW_EXTERNAL_DEPS_SVN
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 pkg-download: fix svn download for deleted path

Ryan, All,

On 2014-06-26 08:17 -0500, Ryan Barnett spake thusly:

Quoted 11 lines

If a SVN path has been deleted in a future revision, downloading a package's source will fail using 'svn checkout -r'. Fix using URL at REV syntax since the SVN command will then verify the path at the specified version. Without using the URL at REV syntax, the SVN command will attempt to verify the path exists on the the HEAD revision before checking out the path at the specified revision.

Error seen if SVN path has been deleted in HEAD using svn checkout -r:
svn: E160013: '/svn/path/' path not found

Signed-off-by Ryan Barnett <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 32 lines
---
 package/pkg-download.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/pkg-download.mk +2 -2
index 4cfb913..e07fd1b 100644
@@ -145,14 +145,14 @@ endef
 define DOWNLOAD_SVN
 	test -e $(DL_DIR)/$($(PKG)_SOURCE) || \
 	(pushd $(DL_DIR) > /dev/null && \
-	$(SVN) export -r $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_DL_DIR) && \
+	$(SVN) export $($(PKG)_SITE)@$($(PKG)_DL_VERSION) $($(PKG)_DL_DIR) && \
 	$(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME)/ && \
 	rm -rf $($(PKG)_DL_DIR) && \
 	popd > /dev/null)
 endef
 
 define SOURCE_CHECK_SVN
-  $(SVN) ls $($(PKG)_SITE) > /dev/null
+  $(SVN) ls $($(PKG)_SITE)@$($(PKG)_DL_VERSION) > /dev/null
 endef
 
 define SHOW_EXTERNAL_DEPS_SVN
Signature · 6 lines
1.7.9.5

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
Applied
#2 lore raw

PATCH 1/1 pkg-download: fix svn download for deleted path

In reply to Ryan Barnett

Dear Ryan Barnett,

Quoted 7 lines · Ryan Barnett

If a SVN path has been deleted in a future revision, downloading a package's source will fail using 'svn checkout -r'. Fix using URL at REV syntax since the SVN command will then verify the path at the specified version. Without using the URL at REV syntax, the SVN command will attempt to verify the path exists on the the HEAD revision before checking out the path at the specified revision.

Quoted 7 lines

Error seen if SVN path has been deleted in HEAD using svn checkout -r:
svn: E160013: '/svn/path/' path not found

Signed-off-by Ryan Barnett <[email protected]>
---
 package/pkg-download.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com