vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-08 05:50:47 +00:00
Code Issues Projects Releases Wiki Activity

Refactor ppa parsing: take pointer to config.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-04-06 19:12:07 +04:00
parent efcce4ef3c
commit 3db7125932
3 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/mirror_create.go
+1 -1
View File
@@ -24,7 +24,7 @@ func aptlyMirrorCreate(cmd *commander.Command, args []string) error {
mirrorName = args[0] mirrorName = args[0]
if len(args) == 2 { if len(args) == 2 {
archiveURL, distribution, components, err = debian.ParsePPA(args[1]) archiveURL, distribution, components, err = debian.ParsePPA(args[1], context.Config())
if err != nil { if err != nil {
return err return err
} }
debian/ppa.go
Vendored
+3 -3
View File
@@ -11,14 +11,14 @@ import (
var ppaRegexp = regexp.MustCompile("^ppa:([^/]+)/(.+)$") var ppaRegexp = regexp.MustCompile("^ppa:([^/]+)/(.+)$")
// ParsePPA converts ppa URL like ppa:user/ppa-name to full HTTP url // ParsePPA converts ppa URL like ppa:user/ppa-name to full HTTP url
func ParsePPA(ppaURL string) (url string, distribution string, components []string, err error) { func ParsePPA(ppaURL string, config *utils.ConfigStructure) (url string, distribution string, components []string, err error) {
matches := ppaRegexp.FindStringSubmatch(ppaURL) matches := ppaRegexp.FindStringSubmatch(ppaURL)
if matches == nil { if matches == nil {
err = fmt.Errorf("unable to parse ppa URL: %v", ppaURL) err = fmt.Errorf("unable to parse ppa URL: %v", ppaURL)
return return
} }
distributorID := utils.Config.PpaDistributorID distributorID := config.PpaDistributorID
if distributorID == "" { if distributorID == "" {
distributorID, err = getDistributorID() distributorID, err = getDistributorID()
if err != nil { if err != nil {
@@ -27,7 +27,7 @@ func ParsePPA(ppaURL string) (url string, distribution string, components []stri
} }
} }
codename := utils.Config.PpaCodename codename := config.PpaCodename
if codename == "" { if codename == "" {
codename, err = getCodename() codename, err = getCodename()
if err != nil { if err != nil {
debian/ppa_test.go
Vendored
+5 -13
View File
@@ -6,27 +6,19 @@ import (
) )
type PpaSuite struct { type PpaSuite struct {
savedConfig utils.ConfigStructure config utils.ConfigStructure
} }
var _ = Suite(&PpaSuite{}) var _ = Suite(&PpaSuite{})
func (s *PpaSuite) SetUpTest(c *C) {
s.savedConfig = utils.Config
}
func (s *PpaSuite) TearDownTest(c *C) {
utils.Config = s.savedConfig
}
func (s *PpaSuite) TestParsePPA(c *C) { func (s *PpaSuite) TestParsePPA(c *C) {
_, _, _, err := ParsePPA("ppa:dedeed") _, _, _, err := ParsePPA("ppa:dedeed", &s.config)
c.Check(err, ErrorMatches, "unable to parse ppa URL.*") c.Check(err, ErrorMatches, "unable to parse ppa URL.*")
utils.Config.PpaDistributorID = "debian" s.config.PpaDistributorID = "debian"
utils.Config.PpaCodename = "wheezy" s.config.PpaCodename = "wheezy"
url, distribution, components, err := ParsePPA("ppa:user/project") url, distribution, components, err := ParsePPA("ppa:user/project", &s.config)
c.Check(err, IsNil) c.Check(err, IsNil)
c.Check(url, Equals, "http://ppa.launchpad.net/user/project/debian") c.Check(url, Equals, "http://ppa.launchpad.net/user/project/debian")
c.Check(distribution, Equals, "wheezy") c.Check(distribution, Equals, "wheezy")