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

Sort architectures for stability of result, use package architecture for dependency search.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-02-18 00:18:55 +04:00
parent d8fe97e0cb
commit 841771c18e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd_snapshot.go
+4 -2
View File
@@ -274,6 +274,8 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
architecturesList = packageList.Architectures(false) architecturesList = packageList.Architectures(false)
} }
sort.Strings(architecturesList)
if len(architecturesList) == 0 { if len(architecturesList) == 0 {
return fmt.Errorf("unable to determine list of architectures, please specify explicitly") return fmt.Errorf("unable to determine list of architectures, please specify explicitly")
} }
@@ -308,11 +310,11 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
} }
// Remove all packages with the same name and architecture // Remove all packages with the same name and architecture
for p := packageList.Search(debian.Dependency{Architecture: arch, Pkg: pkg.Name}); p != nil; { for p := packageList.Search(debian.Dependency{Architecture: pkg.Architecture, Pkg: pkg.Name}); p != nil; {
packageList.Remove(p) packageList.Remove(p)
color.Printf("@r[-]@| %s removed", p) color.Printf("@r[-]@| %s removed", p)
fmt.Printf("\n") fmt.Printf("\n")
p = packageList.Search(debian.Dependency{Architecture: arch, Pkg: pkg.Name}) p = packageList.Search(debian.Dependency{Architecture: pkg.Architecture, Pkg: pkg.Name})
} }
// Add new discovered package // Add new discovered package