From e161313efa76f36efa9f5a7ff54eeba6b8867950 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Tue, 3 Jun 2014 17:25:15 +0400 Subject: [PATCH] Fix aptly serve: correct components list. #36 --- cmd/serve.go | 5 +++-- system/t07_serve/Serve1Test_gold | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/serve.go b/cmd/serve.go index acf76d30..8fe2ee17 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -10,6 +10,7 @@ import ( "net/http" "os" "sort" + "strings" ) func aptlyServe(cmd *commander.Command, args []string) error { @@ -74,11 +75,11 @@ func aptlyServe(cmd *commander.Command, args []string) error { } fmt.Printf("# %s\ndeb http://%s:%s/%s %s %s\n", - repo, listenHost, listenPort, prefix, repo.Distribution, repo.Component) + repo, listenHost, listenPort, prefix, repo.Distribution, strings.Join(repo.Components(), " ")) if utils.StrSliceHasItem(repo.Architectures, "source") { fmt.Printf("deb-src http://%s:%s/%s %s %s\n", - listenHost, listenPort, prefix, repo.Distribution, repo.Component) + listenHost, listenPort, prefix, repo.Distribution, strings.Join(repo.Components(), " ")) } } diff --git a/system/t07_serve/Serve1Test_gold b/system/t07_serve/Serve1Test_gold index 4a90d469..d6abfd59 100644 --- a/system/t07_serve/Serve1Test_gold +++ b/system/t07_serve/Serve1Test_gold @@ -1,8 +1,8 @@ Serving published repositories, recommended apt sources list: -# ./maverick (main) [amd64, i386] publishes [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick +# ./maverick [amd64, i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick} deb http://127.0.0.1:8765/ maverick main -# debian/maverick (main) [amd64, i386, source] publishes [snap2]: Snapshot from mirror [gnuplot-maverick-src]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick [src] +# debian/maverick [amd64, i386, source] publishes {main: [snap2]: Snapshot from mirror [gnuplot-maverick-src]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick [src]} deb http://127.0.0.1:8765/debian/ maverick main deb-src http://127.0.0.1:8765/debian/ maverick main