Skip to content

Allow specifying the path when adding a repository #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow specifying the path when adding a repository #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions repos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,8 @@ func ParseAPTConfigFolder(folderPath string) (RepositoryList, error) {
}

// AddRepository adds the specified repository by changing the specified APT
// config folder (usually /etc/apt). The new repository is saved into
// a file named "managed.list"
func AddRepository(repo *Repository, configFolderPath string) error {
// config folder (usually /etc/apt).
func AddRepository(repo *Repository, configFolderPath, filename string) error {
repos, err := ParseAPTConfigFolder(configFolderPath)
if err != nil {
return fmt.Errorf("parsing APT config: %s", err)
Expand All @@ -184,7 +183,7 @@ func AddRepository(repo *Repository, configFolderPath string) error {
}

// Add to the "managed.list" file
managedPath := filepath.Join(configFolderPath, "sources.list.d", "managed.list")
managedPath := filepath.Join(configFolderPath, "sources.list.d", filename)
f, err := os.OpenFile(managedPath, os.O_APPEND|os.O_WRONLY, 0644)
if os.IsNotExist(err) {
f, err = os.OpenFile(managedPath, os.O_CREATE|os.O_WRONLY, 0644)
Expand Down
6 changes: 3 additions & 3 deletions repos_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ func TestAddAndRemoveRepository(t *testing.T) {
Components: "main",
Comment: "",
}
err := AddRepository(repo1, "testdata/apt2")
err := AddRepository(repo1, "testdata/apt2", "managed.list")
require.NoError(t, err, "Adding repository")
err = AddRepository(repo2, "testdata/apt2")
err = AddRepository(repo2, "testdata/apt2", "managed.list")
require.NoError(t, err, "Adding repository")

// check that we have repo1 and repo2 added
Expand All @@ -78,7 +78,7 @@ func TestAddAndRemoveRepository(t *testing.T) {
require.True(t, repos.Contains(repo1), "Configuration contains: %#v", repo1)
require.True(t, repos.Contains(repo2), "Configuration contains: %#v", repo2)

err = AddRepository(repo2, "testdata/apt2")
err = AddRepository(repo2, "testdata/apt2", "managed.list")
require.Error(t, err, "Adding repository again")

// no changes should have happened
Expand Down