Merge pull request 'fixing windows export/import of profiles' (#444) from winExport into master
continuous-integration/drone/push Build is pending
Details
continuous-integration/drone/push Build is pending
Details
Reviewed-on: #444
This commit is contained in:
commit
88ddecae56
|
@ -12,7 +12,6 @@ import (
|
||||||
"git.openprivacy.ca/openprivacy/log"
|
"git.openprivacy.ca/openprivacy/log"
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
@ -797,7 +796,7 @@ func (cps *CwtchProfileStorage) Export(filename string) error {
|
||||||
defer tarWriter.Close()
|
defer tarWriter.Close()
|
||||||
|
|
||||||
// We need to know the base directory so we can import it later (and prevent duplicates)...
|
// We need to know the base directory so we can import it later (and prevent duplicates)...
|
||||||
profilePath := path.Base(cps.ProfileDirectory)
|
profilePath := filepath.Base(cps.ProfileDirectory)
|
||||||
|
|
||||||
err = addFileToTarWriter(profilePath, profileDB, tarWriter)
|
err = addFileToTarWriter(profilePath, profileDB, tarWriter)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue