aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2018-02-24 14:58:54 +0100
committerMartin Polden <mpolden@mpolden.no>2018-02-24 14:58:54 +0100
commitfdcf4ae11be7ea936adf5a1abe1c122605594b1e (patch)
treefcdba1600e220c3335681d196c474f159239b767
parent3451be7043da054fffa681a52124651b49e291d7 (diff)
Remove unnecessary error
-rw-r--r--cmd/lftpq/main.go16
1 files changed, 7 insertions, 9 deletions
diff --git a/cmd/lftpq/main.go b/cmd/lftpq/main.go
index cca2576..a80b453 100644
--- a/cmd/lftpq/main.go
+++ b/cmd/lftpq/main.go
@@ -45,17 +45,15 @@ func (c *CLI) Run() error {
}
var queues []queue.Queue
if c.Import {
- queues, err = queue.Read(cfg.Sites, c.rd)
-
+ if queues, err = queue.Read(cfg.Sites, c.rd); err != nil {
+ return err
+ }
} else {
- queues, err = c.queueFor(cfg.Sites)
- }
- if err != nil {
- return err
+ queues = c.queuesFor(cfg.Sites)
}
for _, q := range queues {
if err := c.transfer(q); err != nil {
- c.printf("error while processing queue for %s: %s\n", q.Site.Name, err)
+ c.printf("error while transferring queue for %s: %s\n", q.Site.Name, err)
continue
}
}
@@ -76,7 +74,7 @@ func (c *CLI) printf(format string, vs ...interface{}) {
}
}
-func (c *CLI) queueFor(sites []queue.Site) ([]queue.Queue, error) {
+func (c *CLI) queuesFor(sites []queue.Site) []queue.Queue {
var queues []queue.Queue
for _, s := range sites {
if s.Skip {
@@ -95,7 +93,7 @@ func (c *CLI) queueFor(sites []queue.Site) ([]queue.Queue, error) {
queue := queue.New(s, files)
queues = append(queues, queue)
}
- return queues, nil
+ return queues
}
func (c *CLI) transfer(q queue.Queue) error {