Merge branch 'master' into deterministic-stanza-WriteTo

This commit is contained in:
Andrey Smirnov
2019-01-25 01:27:31 +03:00
committed by GitHub
23 changed files with 757 additions and 733 deletions
+4 -1
View File
@@ -1202,7 +1202,10 @@ func (collection *PublishedRepoCollection) Remove(publishedStorageProvider aptly
err = repo.RemoveFiles(publishedStorageProvider, removePrefix, removePoolComponents, progress)
if err != nil {
return err
if !force {
return fmt.Errorf("published files removal failed, use -force-drop to override: %s", err)
}
// ignore error with -force-drop
}
collection.list[len(collection.list)-1], collection.list[repoPosition], collection.list =