mirror of
https://github.com/restic/restic.git
synced 2025-03-16 00:00:05 +01:00
solved rebase conflicts
This commit is contained in:
parent
d055db7ae5
commit
8f93488a94
2 changed files with 0 additions and 9 deletions
|
@ -102,15 +102,9 @@ func (bb *s3Blob) Finalize(t backend.Type, name string) error {
|
|||
path := s3path(t, name)
|
||||
|
||||
// Check key does not already exist
|
||||
<<<<<<< HEAD
|
||||
_, err := bb.b.bucket.GetReader(path)
|
||||
if err == nil {
|
||||
return errors.New("key already exists!")
|
||||
=======
|
||||
key, err := bb.b.bucket.GetKey(path)
|
||||
if err == nil && key.Key == path {
|
||||
return errors.New("key already exists")
|
||||
>>>>>>> integrated the comments from the review, simplified the backend and added some documentation
|
||||
}
|
||||
|
||||
<-bb.b.connChan
|
||||
|
|
|
@ -136,15 +136,12 @@ func (o GlobalOptions) OpenRepository() (*repository.Repository, error) {
|
|||
// * sftp://host//tmp/backup -> remote sftp repository on host at path /tmp/backup
|
||||
// * http://host -> remote and public http repository
|
||||
func open(u string) (backend.Backend, error) {
|
||||
<<<<<<< HEAD
|
||||
// check if the url is a directory that exists
|
||||
fi, err := os.Stat(u)
|
||||
if err == nil && fi.IsDir() {
|
||||
return local.Open(u)
|
||||
}
|
||||
|
||||
=======
|
||||
>>>>>>> integrated the comments from the review, simplified the backend and added some documentation
|
||||
url, err := url.Parse(u)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
Loading…
Add table
Reference in a new issue