Fix keyring in system test.

aptly/version.go

@@ -1,7 +1,7 @@
 package aptly
 
 // Version of aptly
-const Version = "0.4"
+const Version = "0.4.1"
 
 // Enable debugging features?
 const EnableDebug = false

debian/remote.go

@@ -12,6 +12,7 @@ import (
 	"log"
 	"net/url"
 	"os"
+	"path"
 	"strconv"
 	"strings"
 	"time"
@@ -246,6 +247,9 @@ ok:
 		}
 
 		components := strings.Split(stanza["Components"], " ")
+		for i := range components {
+			components[i] = path.Base(components[i])
+		}
 		if len(repo.Components) == 0 {
 			repo.Components = components
 		} else {

http/download.go

@@ -218,20 +218,18 @@ func DownloadTempWithChecksum(downloader aptly.Downloader, url string, expected
 
 	if expected.Size != -1 && downloader.GetProgress() != nil {
 		downloader.GetProgress().InitBar(expected.Size, true)
+		defer downloader.GetProgress().ShutdownBar()
 	}
 
 	ch := make(chan error, 1)
 	downloader.DownloadWithChecksum(url, tempfile, ch, expected, ignoreMismatch)
 
 	err = <-ch
+
 	if err != nil {
 		return nil, err
 	}
 
-	if expected.Size != -1 && downloader.GetProgress() != nil {
-		downloader.GetProgress().ShutdownBar()
-	}
-
 	file, err := os.Open(tempfile)
 	if err != nil {
 		return nil, err

main.go

@@ -60,7 +60,9 @@ func main() {
 		if errorMessage != "" {
 			fmt.Print(errorMessage)
 		}
-		os.Exit(returnCode)
+		if returnCode != 0 {
+			os.Exit(returnCode)
+		}
 	}()
 
 	command := cmd.RootCommand()

system/t01_version/VersionTest_gold

@@ -1 +1 @@
-aptly version: 0.4
+aptly version: 0.4.1

system/t04_mirror/CreateMirror19Test_gold

@@ -0,0 +1,6 @@
+Downloading http://security.debian.org/dists/wheezy/updates/InRelease...
+gpgv:  RSA key ID 46925553
+gpgv: Good signature from "Debian Archive Automatic Signing Key (7.0/wheezy) <ftpmaster@debian.org>"
+
+Mirror [mirror19]: http://security.debian.org/ wheezy/updates [src] successfully added.
+You can run 'aptly mirror update mirror19' to download repository contents.

system/t04_mirror/CreateMirror19Test_mirror_show

@@ -0,0 +1,20 @@
+Name: mirror19
+Archive Root URL: http://security.debian.org/
+Distribution: wheezy/updates
+Components: main
+Architectures: i386
+Download Sources: yes
+Last update: never
+
+Information from release file:
+Architectures: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
+Codename: wheezy
+Components: updates/main updates/contrib updates/non-free
+Date: Tue, 11 Mar 2014 21:11:28 UTC
+Description:  Debian 7.0 Security Updates
+
+Label: Debian-Security
+Origin: Debian
+Suite: stable
+Valid-Until: Fri, 21 Mar 2014 21:11:28 UTC
+Version: 7.0

system/t04_mirror/create.py

@@ -207,3 +207,20 @@ class CreateMirror18Test(BaseTest):
     def check(self):
         self.check_output()
         self.check_cmd_output("aptly mirror show mirror18", "mirror_show")
+
+
+class CreateMirror19Test(BaseTest):
+    """
+    create mirror: mirror with / in components
+    """
+    fixtureGpg = True
+    outputMatchPrepare = lambda _, s: re.sub(r'Signature made .* using', '', s)
+
+    runCmd = "aptly -architectures='i386' mirror create -keyring=aptlytest.gpg -with-sources mirror19 http://security.debian.org/ wheezy/updates main"
+
+    def check(self):
+        def removeDates(s):
+            return re.sub(r"(Date|Valid-Until): [,0-9:+A-Za-z -]+\n", "", s)
+
+        self.check_output()
+        self.check_cmd_output("aptly mirror show mirror19", "mirror_show", match_prepare=removeDates)