[Qa-jenkins-scm] [jenkins.debian.net] 03/04: openwrt_common/save_lede_results: fix last path/popd/pushd bugs

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit e8d0a820cf455cb577b85d74869c0e8ddeaf4cb0
Author: Alexander Couzens <lynxis at fe80.eu>
Date:   Sat Jul 23 02:04:41 2016 +0200

    openwrt_common/save_lede_results: fix last path/popd/pushd bugs
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_openwrt_common.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/bin/reproducible_openwrt_common.sh b/bin/reproducible_openwrt_common.sh
index 34226dd..70f811f 100644
--- a/bin/reproducible_openwrt_common.sh
+++ b/bin/reproducible_openwrt_common.sh
@@ -34,7 +34,7 @@ save_logs() {
 
 save_lede_results() {
 	RUN=$1
-	cd bin/targets
+	pushd bin/targets
 	for target in * ; do
 		pushd $target || continue
 		for subtarget in * ; do
@@ -55,21 +55,27 @@ save_lede_results() {
 				done
 				popd
 			fi
+			popd
 		done
 		popd
 	done
+	popd
 
 	# arch is like mips_34kc_dsp
-	popd bin/packages/
+	pushd bin/packages/
 	for arch in * ; do
 		pushd $arch || continue
-		for package in $(find * -name "*.ipk") ; do
-			mkdir -p $TMPDIR/$RUN/packages/$arch/$(dirname $package)
-			cp -p $package $TMPDIR/$RUN/packages/$arch/$(dirname $package)/
+		for feed in * ; do
+			pushd $feed || continue
+			for package in $(find * -name "*.ipk") ; do
+				mkdir -p $TMPDIR/$RUN/packages/$arch/$feed/$(dirname $package)
+				cp -p $package $TMPDIR/$RUN/packages/$arch/$feed/$(dirname $package)/
+			done
+			popd
 		done
 		popd
 	done
-	pushd
+	popd
 }
 
 save_openwrt_results() {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git