Merge branch 'master' into feature_localfiles_publishstorage

aptly-dev · Apr 13, 2017 · 122b666 · 122b666
2 parents 06b2ea9 + ac475c0
commit 122b666
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/deb/publish.go b/deb/publish.go
@@ -473,8 +473,17 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorageP
 	if err != nil {
 		return err
 	}
-	defer tempDB.Close()
-	defer tempDB.Drop()
+	defer func() {
+		var e error
+		e = tempDB.Close()
+		if e != nil && progress != nil {
+			progress.Printf("failed to close temp DB: %s", err)
+		}
+		e = tempDB.Drop()
+		if e != nil && progress != nil {
+			progress.Printf("failed to drop temp DB: %s", err)
+		}
+	}()
 
 	if progress != nil {
 		progress.Printf("Loading packages...\n")