mirror of https://github.com/perkeep/perkeep.git
app/publisher: use relative paths in filenames within zip
Change-Id: Ib491b8e664e2f623d61dfd8afb81242042c0cd5c
This commit is contained in:
parent
8a545a1ed2
commit
f504d10ee4
|
@ -107,7 +107,7 @@ func (zh *zipHandler) blobList(dirPath string, dirBlob blob.Ref) ([]*blobFile, e
|
|||
var list []*blobFile
|
||||
if isDir {
|
||||
dirRoot := dirBlobPath[1]
|
||||
children, err := zh.blobsFromDir("/", dirRoot)
|
||||
children, err := zh.blobsFromDir("", dirRoot)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("Could not get list of blobs from %v: %v", dirRoot, err)
|
||||
}
|
||||
|
@ -234,7 +234,7 @@ func (zh *zipHandler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
|
|||
http.Error(rw, "Invalid method", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
bf, err := zh.blobList("/", zh.root)
|
||||
bf, err := zh.blobList("", zh.root)
|
||||
if err != nil {
|
||||
log.Printf("Could not serve zip for %v: %v", zh.root, err)
|
||||
http.Error(rw, "Server error", http.StatusInternalServerError)
|
||||
|
|
Loading…
Reference in New Issue