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

Fixups after renaming debian -> deb. #21

Browse Source
This commit is contained in:
Andrey Smirnov
2014-04-07 21:19:38 +04:00
parent fd662c9275
commit ff045f9a48
50 changed files with 123 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/snapshot_merge.go
+3 -3
View File
@@ -2,7 +2,7 @@ package cmd
import (
"fmt"
"github.com/smira/aptly/debian"
"github.com/smira/aptly/deb"
"github.com/smira/commander"
"strings"
)
@@ -14,7 +14,7 @@ func aptlySnapshotMerge(cmd *commander.Command, args []string) error {
return err
}
sources := make([]*debian.Snapshot, len(args)-1)
sources := make([]*deb.Snapshot, len(args)-1)
for i := 0; i < len(args)-1; i++ {
sources[i], err = context.CollectionFactory().SnapshotCollection().ByName(args[i+1])
@@ -40,7 +40,7 @@ func aptlySnapshotMerge(cmd *commander.Command, args []string) error {
}
// Create <destination> snapshot
destination := debian.NewSnapshotFromRefList(args[0], sources, result,
destination := deb.NewSnapshotFromRefList(args[0], sources, result,
fmt.Sprintf("Merged from sources: %s", strings.Join(sourceDescription, ", ")))
err = context.CollectionFactory().SnapshotCollection().Add(destination)