Merge pull request #4 from thz/master

bugfix: result-serving's directory index
carosio · Nov 9, 2015 · 382c7b1 · 382c7b1
2 parents e60fa90 + 3120b1f
commit 382c7b1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/libredo/data/result_httpd.py b/libredo/data/result_httpd.py
@@ -49,9 +49,11 @@ def list_directory(self, path):
         except os.error:
             self.send_error(404, "No permission to list directory")
             return None
+        while path[-1] == '/':
+                path = path[:-1]
         if path == self.server.chroot:
-	    list.append("packages/")
-	    list.append("packages.tar")
+                list.append("packages/")
+                list.append("packages.tar")
 
         list.sort(lambda a, b: cmp(a.lower(), b.lower()))
         f = StringIO()

diff --git a/libredo/data/serve.sh b/libredo/data/serve.sh
@@ -49,6 +49,7 @@ cd /REDO/build/tmp/deploy/images
 
 find /REDO/build/tmp/deploy/images -type l -name "core-image*.iso" -exec ln -s {} "$RESULTDIR/" ';'
 find /REDO/build/tmp/deploy/images -type l -name "core-image*.ova" -exec ln -s {} "$RESULTDIR/" ';'
+find /REDO/build/tmp/deploy/images -type l -name "core-image*-sdimg" -exec ln -s {} "$RESULTDIR/" ';'
 )
 
 (
@@ -72,4 +73,4 @@ echo
 find $RESULTDIR
 echo
 
-python /REDO/results/result_httpd.py 80 /REDO/results/$BUILDID /REDO/build/tmp/deploy/ipk
+python /REDO/results/result_httpd.py 80 "$RESULTDIR" /REDO/build/tmp/deploy/ipk