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

Refactor

Browse Source
This commit is contained in:
jola5
2017-01-29 12:25:38 +01:00
parent 970b1a424a
commit 4456f8da57
4 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/api_serve.go
+3 -11
View File
@@ -3,11 +3,10 @@ package cmd
import (
"fmt"
"github.com/smira/aptly/api"
"github.com/smira/aptly/utils"
"github.com/smira/commander"
"github.com/smira/flag"
"net/http"
"os"
"golang.org/x/sys/unix"
)
func aptlyAPIServe(cmd *commander.Command, args []string) error {
@@ -26,16 +25,9 @@ func aptlyAPIServe(cmd *commander.Command, args []string) error {
// anything else must fail.
// E.g.: Running the service under a different user may lead to a rootDir
// that exists but is not usable due to access permissions.
// Config loads and returns current configuration
_, err = os.Stat(context.Config().RootDir);
err = utils.DirIsAccessible(context.Config().RootDir)
if err != nil {
if ! os.IsNotExist(err) {
return fmt.Errorf("Something went wrong, %v", err)
}
} else {
if unix.Access(context.Config().RootDir, unix.W_OK) != nil {
return fmt.Errorf("Configured rootDir '%s' is inaccessible, check access rights", context.Config().RootDir)
}
return err
}
listen := context.Flags().Lookup("listen").Value.String()
cmd/serve.go
+2 -10
View File
@@ -12,7 +12,6 @@ import (
"os"
"sort"
"strings"
"golang.org/x/sys/unix"
)
func aptlyServe(cmd *commander.Command, args []string) error {
@@ -29,16 +28,9 @@ func aptlyServe(cmd *commander.Command, args []string) error {
// anything else must fail.
// E.g.: Running the service under a different user may lead to a rootDir
// that exists but is not usable due to access permissions.
// Config loads and returns current configuration
_, err = os.Stat(context.Config().RootDir);
err = utils.DirIsAccessible(context.Config().RootDir)
if err != nil {
if ! os.IsNotExist(err) {
return fmt.Errorf("Something went wrong, %v", err)
}
} else {
if unix.Access(context.Config().RootDir, unix.W_OK) != nil {
return fmt.Errorf("Configured rootDir '%s' is inaccessible, check access rights", context.Config().RootDir)
}
return err
}
if context.CollectionFactory().PublishedRepoCollection().Len() == 0 {