Refactoring PublishedStorage interface: leave operations suitable for S3. #15

aptly/interfaces.go

@@ -5,7 +5,6 @@ package aptly
 import (
 	"github.com/smira/aptly/utils"
 	"io"
-	"os"
 )
 
 // PackagePool is asbtraction of package pool storage.
@@ -26,12 +25,12 @@ type PackagePool interface {
 
 // PublishedStorage is abstraction of filesystem storing all published repositories
 type PublishedStorage interface {
-	// PublicPath returns root of public part
+	// XXX: REMOVE: PublicPath returns root of public part
 	PublicPath() string
 	// MkDir creates directory recursively under public path
 	MkDir(path string) error
-	// CreateFile creates file for writing under public path
-	CreateFile(path string) (*os.File, error)
+	// PutFile puts file into published storage at specified path
+	PutFile(path string, sourceFilename string) error
 	// RemoveDirs removes directory structure under public path
 	RemoveDirs(path string, progress Progress) error
 	// Remove removes single file under public path
@@ -40,8 +39,6 @@ type PublishedStorage interface {
 	LinkFromPool(publishedDirectory string, sourcePool PackagePool, sourcePath string) error
 	// Filelist returns list of files under prefix
 	Filelist(prefix string) ([]string, error)
-	// ChecksumsForFile proxies requests to utils.ChecksumsForFile, joining public path
-	ChecksumsForFile(path string) (utils.ChecksumInfo, error)
 	// RenameFile renames (moves) file
 	RenameFile(oldName, newName string) error
 }

deb/publish.go

@@ -9,6 +9,7 @@ import (
 	"github.com/smira/aptly/database"
 	"github.com/smira/aptly/utils"
 	"github.com/ugorji/go/codec"
+	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -432,6 +433,13 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorage
 		progress.Printf("Generating metadata files and linking package files...\n")
 	}
 
+	var tempDir string
+	tempDir, err = ioutil.TempDir(os.TempDir(), "aptly")
+	if err != nil {
+		return err
+	}
+	defer os.RemoveAll(tempDir)
+
 	for component, list := range lists {
 		var relativePath string
 
@@ -452,13 +460,11 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorage
 			}
 
 			var packagesFile *os.File
-			packagesFile, err = publishedStorage.CreateFile(filepath.Join(basePath, relativePath+suffix))
-			if err != nil {
-				return fmt.Errorf("unable to creates Packages file: %s", err)
-			}
 
-			if suffix != "" {
-				renameMap[filepath.Join(basePath, relativePath+suffix)] = filepath.Join(basePath, relativePath)
+			packagesFileName := filepath.Join(tempDir, fmt.Sprintf("pkgs_%s_%s", component, arch))
+			packagesFile, err = os.Create(packagesFileName)
+			if err != nil {
+				return fmt.Errorf("unable to create temporary Packages file: %s", err)
 			}
 
 			bufWriter := bufio.NewWriter(packagesFile)
@@ -505,31 +511,26 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorage
 				return fmt.Errorf("unable to compress Packages files: %s", err)
 			}
 
-			if suffix != "" {
-				renameMap[filepath.Join(basePath, relativePath+suffix+".gz")] = filepath.Join(basePath, relativePath+".gz")
-				renameMap[filepath.Join(basePath, relativePath+suffix+".bz2")] = filepath.Join(basePath, relativePath+".bz2")
-			}
-
 			packagesFile.Close()
 
-			var checksumInfo utils.ChecksumInfo
-			checksumInfo, err = publishedStorage.ChecksumsForFile(filepath.Join(basePath, relativePath+suffix))
-			if err != nil {
-				return fmt.Errorf("unable to collect checksums: %s", err)
-			}
-			generatedFiles[relativePath] = checksumInfo
+			for _, ext := range []string{"", ".gz", ".bz2"} {
+				var checksumInfo utils.ChecksumInfo
 
-			checksumInfo, err = publishedStorage.ChecksumsForFile(filepath.Join(basePath, relativePath+suffix+".gz"))
-			if err != nil {
-				return fmt.Errorf("unable to collect checksums: %s", err)
-			}
-			generatedFiles[relativePath+".gz"] = checksumInfo
+				checksumInfo, err = utils.ChecksumsForFile(packagesFileName + ext)
+				if err != nil {
+					return fmt.Errorf("unable to collect checksums: %s", err)
+				}
+				generatedFiles[relativePath+ext] = checksumInfo
 
-			checksumInfo, err = publishedStorage.ChecksumsForFile(filepath.Join(basePath, relativePath+suffix+".bz2"))
-			if err != nil {
-				return fmt.Errorf("unable to collect checksums: %s", err)
+				err = publishedStorage.PutFile(filepath.Join(basePath, relativePath+suffix+ext), packagesFileName+ext)
+				if err != nil {
+					return fmt.Errorf("unable to publish file: %s", err)
+				}
+
+				if suffix != "" {
+					renameMap[filepath.Join(basePath, relativePath+suffix+ext)] = filepath.Join(basePath, relativePath+ext)
+				}
 			}
-			generatedFiles[relativePath+".bz2"] = checksumInfo
 
 			if progress != nil {
 				progress.ShutdownBar()
@@ -552,13 +553,11 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorage
 			}
 
 			var file *os.File
-			file, err = publishedStorage.CreateFile(filepath.Join(basePath, relativePath+suffix))
-			if err != nil {
-				return fmt.Errorf("unable to create Release file: %s", err)
-			}
 
-			if suffix != "" {
-				renameMap[filepath.Join(basePath, relativePath+suffix)] = filepath.Join(basePath, relativePath)
+			fileName := filepath.Join(tempDir, fmt.Sprintf("release_%s_%s", component, arch))
+			file, err = os.Create(fileName)
+			if err != nil {
+				return fmt.Errorf("unable to create temporary Release file: %s", err)
 			}
 
 			bufWriter := bufio.NewWriter(file)
@@ -576,11 +575,22 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorage
 			file.Close()
 
 			var checksumInfo utils.ChecksumInfo
-			checksumInfo, err = publishedStorage.ChecksumsForFile(filepath.Join(basePath, relativePath+suffix))
+			checksumInfo, err = utils.ChecksumsForFile(fileName)
 			if err != nil {
 				return fmt.Errorf("unable to collect checksums: %s", err)
 			}
 			generatedFiles[relativePath] = checksumInfo
+
+			err = publishedStorage.PutFile(filepath.Join(basePath, relativePath+suffix), fileName)
+			if err != nil {
+				file.Close()
+				return fmt.Errorf("unable to publish file: %s", err)
+			}
+
+			if suffix != "" {
+				renameMap[filepath.Join(basePath, relativePath+suffix)] = filepath.Join(basePath, relativePath)
+			}
+
 		}
 	}
 
@@ -603,13 +613,11 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorage
 		release["SHA256"] += fmt.Sprintf(" %s %8d %s\n", info.SHA256, info.Size, path)
 	}
 
-	releaseFile, err := publishedStorage.CreateFile(filepath.Join(basePath, "Release"+suffix))
+	var releaseFile *os.File
+	releaseFilename := filepath.Join(tempDir, "Release")
+	releaseFile, err = os.Create(releaseFilename)
 	if err != nil {
-		return fmt.Errorf("unable to create Release file: %s", err)
-	}
-
-	if suffix != "" {
-		renameMap[filepath.Join(basePath, "Release"+suffix)] = filepath.Join(basePath, "Release")
+		return fmt.Errorf("unable to create temporary Release file: %s", err)
 	}
 
 	bufWriter := bufio.NewWriter(releaseFile)
@@ -624,9 +632,17 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorage
 		return fmt.Errorf("unable to create Release file: %s", err)
 	}
 
-	releaseFilename := releaseFile.Name()
 	releaseFile.Close()
 
+	if suffix != "" {
+		renameMap[filepath.Join(basePath, "Release"+suffix)] = filepath.Join(basePath, "Release")
+	}
+
+	err = publishedStorage.PutFile(filepath.Join(basePath, "Release"+suffix), releaseFilename)
+	if err != nil {
+		return fmt.Errorf("unable to publish file: %s", err)
+	}
+
 	// Signing files might output to console, so flush progress writer first
 	if progress != nil {
 		progress.Flush()
@@ -648,6 +664,16 @@ func (p *PublishedRepo) Publish(packagePool aptly.PackagePool, publishedStorage
 			renameMap[filepath.Join(basePath, "InRelease"+suffix)] = filepath.Join(basePath, "InRelease")
 		}
 
+		err = publishedStorage.PutFile(filepath.Join(basePath, "Release"+suffix+".gpg"), releaseFilename+".gpg")
+		if err != nil {
+			return fmt.Errorf("unable to publish file: %s", err)
+		}
+
+		err = publishedStorage.PutFile(filepath.Join(basePath, "InRelease"+suffix),
+			filepath.Join(filepath.Dir(releaseFilename), "InRelease"+suffix))
+		if err != nil {
+			return fmt.Errorf("unable to publish file: %s", err)
+		}
 	}
 
 	for oldName, newName := range renameMap {

deb/publish_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/smira/aptly/database"
 	"github.com/smira/aptly/files"
 	"github.com/ugorji/go/codec"
+	"io/ioutil"
 	. "launchpad.net/gocheck"
 	"os"
 	"path/filepath"
@@ -38,11 +39,11 @@ func (n *NullSigner) SetKeyRing(keyring, secretKeyring string) {
 }
 
 func (n *NullSigner) DetachedSign(source string, destination string) error {
-	return nil
+	return ioutil.WriteFile(destination, []byte{}, 0644)
 }
 
 func (n *NullSigner) ClearSign(source string, destination string) error {
-	return nil
+	return ioutil.WriteFile(destination, []byte{}, 0644)
 }
 
 type PublishedRepoSuite struct {

files/public.go

@@ -3,7 +3,7 @@ package files
 import (
 	"fmt"
 	"github.com/smira/aptly/aptly"
-	"github.com/smira/aptly/utils"
+	"io"
 	"os"
 	"path/filepath"
 	"syscall"
@@ -34,9 +34,26 @@ func (storage *PublishedStorage) MkDir(path string) error {
 	return os.MkdirAll(filepath.Join(storage.rootPath, path), 0755)
 }
 
-// CreateFile creates file for writing under public path
-func (storage *PublishedStorage) CreateFile(path string) (*os.File, error) {
-	return os.Create(filepath.Join(storage.rootPath, path))
+// PutFile puts file into published storage at specified path
+func (storage *PublishedStorage) PutFile(path string, sourceFilename string) error {
+	var (
+		source, f *os.File
+		err       error
+	)
+	source, err = os.Open(sourceFilename)
+	if err != nil {
+		return err
+	}
+	defer source.Close()
+
+	f, err = os.Create(filepath.Join(storage.rootPath, path))
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	_, err = io.Copy(f, source)
+	return err
 }
 
 // Remove removes single file under public path
@@ -119,11 +136,6 @@ func (storage *PublishedStorage) Filelist(prefix string) ([]string, error) {
 	return result, err
 }
 
-// ChecksumsForFile proxies requests to utils.ChecksumsForFile, joining public path
-func (storage *PublishedStorage) ChecksumsForFile(path string) (utils.ChecksumInfo, error) {
-	return utils.ChecksumsForFile(filepath.Join(storage.rootPath, path))
-}
-
 // RenameFile renames (moves) file
 func (storage *PublishedStorage) RenameFile(oldName, newName string) error {
 	return os.Rename(filepath.Join(storage.rootPath, oldName), filepath.Join(storage.rootPath, newName))

files/public_test.go

@@ -32,13 +32,12 @@ func (s *PublishedStorageSuite) TestMkDir(c *C) {
 	c.Assert(err, IsNil)
 }
 
-func (s *PublishedStorageSuite) TestCreateFile(c *C) {
+func (s *PublishedStorageSuite) TesPutFile(c *C) {
 	err := s.storage.MkDir("ppa/dists/squeeze/")
 	c.Assert(err, IsNil)
 
-	file, err := s.storage.CreateFile("ppa/dists/squeeze/Release")
+	err = s.storage.PutFile("ppa/dists/squeeze/Release", "/dev/null")
 	c.Assert(err, IsNil)
-	defer file.Close()
 
 	_, err = os.Stat(filepath.Join(s.storage.rootPath, "ppa/dists/squeeze/Release"))
 	c.Assert(err, IsNil)
@@ -48,13 +47,11 @@ func (s *PublishedStorageSuite) TestFilelist(c *C) {
 	err := s.storage.MkDir("ppa/pool/main/a/ab/")
 	c.Assert(err, IsNil)
 
-	file, err := s.storage.CreateFile("ppa/pool/main/a/ab/a.deb")
+	err = s.storage.PutFile("ppa/pool/main/a/ab/a.deb", "/dev/null")
 	c.Assert(err, IsNil)
-	defer file.Close()
 
-	file2, err := s.storage.CreateFile("ppa/pool/main/a/ab/b.deb")
+	err = s.storage.PutFile("ppa/pool/main/a/ab/b.deb", "/dev/null")
 	c.Assert(err, IsNil)
-	defer file2.Close()
 
 	list, err := s.storage.Filelist("ppa/pool/main/")
 	c.Check(err, IsNil)
@@ -69,9 +66,8 @@ func (s *PublishedStorageSuite) TestRenameFile(c *C) {
 	err := s.storage.MkDir("ppa/dists/squeeze/")
 	c.Assert(err, IsNil)
 
-	file, err := s.storage.CreateFile("ppa/dists/squeeze/Release")
+	err = s.storage.PutFile("ppa/dists/squeeze/Release", "/dev/null")
 	c.Assert(err, IsNil)
-	defer file.Close()
 
 	err = s.storage.RenameFile("ppa/dists/squeeze/Release", "ppa/dists/squeeze/InRelease")
 	c.Check(err, IsNil)
@@ -84,9 +80,8 @@ func (s *PublishedStorageSuite) TestRemoveDirs(c *C) {
 	err := s.storage.MkDir("ppa/dists/squeeze/")
 	c.Assert(err, IsNil)
 
-	file, err := s.storage.CreateFile("ppa/dists/squeeze/Release")
+	err = s.storage.PutFile("ppa/dists/squeeze/Release", "/dev/null")
 	c.Assert(err, IsNil)
-	defer file.Close()
 
 	err = s.storage.RemoveDirs("ppa/dists/", nil)
 
@@ -99,9 +94,8 @@ func (s *PublishedStorageSuite) TestRemove(c *C) {
 	err := s.storage.MkDir("ppa/dists/squeeze/")
 	c.Assert(err, IsNil)
 
-	file, err := s.storage.CreateFile("ppa/dists/squeeze/Release")
+	err = s.storage.PutFile("ppa/dists/squeeze/Release", "/dev/null")
 	c.Assert(err, IsNil)
-	defer file.Close()
 
 	err = s.storage.Remove("ppa/dists/squeeze/Release")
 

system/t06_publish/PublishRepo14Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Local repo local-repo has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishRepo15Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Local repo local-repo has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishRepo16Test_gold

@@ -1,8 +1,8 @@
 Warning: publishing from empty source, architectures list should be complete, it can't be changed after publishing (use -architectures flag)
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Local repo local-repo has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishRepo17Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Local repos repo1, repo2 have been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishRepo18Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/squeeze/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/squeeze/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Local repos repo1, repo2 have been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishRepo1Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Local repo local-repo has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishRepo2Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Local repo local-repo has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishRepo3Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Local repo local-repo has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishRepo4Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/ppa/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/ppa/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Local repo local-repo has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishSnapshot16Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Snapshot snap16 has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishSnapshot17Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Snapshot snap17 has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishSnapshot1Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Snapshot snap1 has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishSnapshot24Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/squeeze/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/squeeze/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Snapshot snap24 has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishSnapshot25Test_gold

@@ -1,8 +1,8 @@
 Warning: publishing from empty source, architectures list should be complete, it can't be changed after publishing (use -architectures flag)
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Snapshot snap25 has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishSnapshot26Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Snapshots snap26.1, snap26.2 have been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishSnapshot27Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Snapshots snap27.1, snap27.2 have been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishSnapshot2Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/squeeze/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/squeeze/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Snapshot snap2 has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishSnapshot3Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/squeeze/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/squeeze/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Snapshot snap3 has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishSnapshot4Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/squeeze/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/squeeze/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Snapshot snap4 has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishSnapshot5Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/ppa/smira/dists/squeeze/Release' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/ppa/smira/dists/squeeze/Release' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 
 Snapshot snap5 has been successfully published.
 Please setup your webserver to serve directory '${HOME}/.aptly/public' with autoindexing.

system/t06_publish/PublishSwitch1Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release.tmp' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release.tmp' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 Cleaning up prefix "." components main...
 
 Publish for snapshot ./maverick [amd64, i386] publishes {main: [snap3]: Pulled into 'snap2' with 'snap1' as source, pull request was: 'gnuplot-x11'} has been successfully switched to new snapshot.

system/t06_publish/PublishSwitch2Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/ppa/dists/maverick/Release.tmp' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/ppa/dists/maverick/Release.tmp' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 Cleaning up prefix "ppa" components main...
 
 Publish for snapshot ppa/maverick [amd64, i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick} has been successfully switched to new snapshot.

system/t06_publish/PublishSwitch3Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release.tmp' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release.tmp' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 Cleaning up prefix "." components main...
 
 Publish for snapshot ./maverick [amd64, i386] publishes {main: [snap3]: Pulled into 'snap2' with 'snap1' as source, pull request was: 'gnuplot-x11'} has been successfully switched to new snapshot.

system/t06_publish/PublishSwitch4Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/ppa/dists/maverick/Release.tmp' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/ppa/dists/maverick/Release.tmp' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 Cleaning up prefix "ppa" components main...
 
 Publish for snapshot ppa/maverick [i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick} has been successfully switched to new snapshot.

system/t06_publish/PublishSwitch8Test_gold

@@ -1,7 +1,7 @@
 Loading packages...
 Generating metadata files and linking package files...
-Signing file '${HOME}/.aptly/public/dists/maverick/Release.tmp' with gpg, please enter your passphrase when prompted:
-Clearsigning file '${HOME}/.aptly/public/dists/maverick/Release.tmp' with gpg, please enter your passphrase when prompted:
+Signing file 'Release' with gpg, please enter your passphrase when prompted:
+Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
 Cleaning up prefix "." components b, c...
 
 Publish for snapshot ./maverick [amd64, i386, source] publishes {a: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}, {b: [snap3]: Pulled into 'snap2' with 'snap1' as source, pull request was: 'gnuplot-x11'}, {c: [local2]: Snapshot from local repo [local-repo]} has been successfully switched to new snapshot.