vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-04-17 19:08:13 +00:00
Code Issues Projects Releases Wiki Activity

aptly snapshot pull outputs all messages through progress.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-03-06 23:03:39 +04:00
parent b5f35cd540
commit d5f0c576d1
10 changed files with 79 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cmd/snapshot_pull.go
View File

@@ -5,7 +5,6 @@ import (
"github.com/gonuts/commander"
"github.com/gonuts/flag"
"github.com/smira/aptly/debian"
"github.com/wsxiaoys/terminal/color"
"sort"
"strings"
)
@@ -45,11 +44,11 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
return fmt.Errorf("unable to pull: %s", err)
}
fmt.Printf("Dependencies would be pulled into snapshot:\n %s\nfrom snapshot:\n %s\nand result would be saved as new snapshot %s.\n",
context.progress.Printf("Dependencies would be pulled into snapshot:\n %s\nfrom snapshot:\n %s\nand result would be saved as new snapshot %s.\n",
snapshot, source, args[2])
// Convert snapshot to package list
fmt.Printf("Loading packages (%d)...\n", snapshot.RefList().Len()+source.RefList().Len())
context.progress.Printf("Loading packages (%d)...\n", snapshot.RefList().Len()+source.RefList().Len())
packageList, err := debian.NewPackageListFromRefList(snapshot.RefList(), packageCollection)
if err != nil {
return fmt.Errorf("unable to load packages: %s", err)
@@ -60,7 +59,7 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
return fmt.Errorf("unable to load packages: %s", err)
}
fmt.Printf("Building indexes...\n")
context.progress.Printf("Building indexes...\n")
packageList.PrepareIndex()
sourcePackageList.PrepareIndex()
@@ -103,8 +102,7 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
// Search for package that can satisfy dependencies
pkg := sourcePackageList.Search(dep)
if pkg == nil {
color.Printf("@y[!]@| @!Dependency %s can't be satisfied with source %s@|", &dep, source)
fmt.Printf("\n")
context.progress.ColoredPrintf("@y[!]@| @!Dependency %s can't be satisfied with source %s@|", &dep, source)
continue
}
@@ -112,16 +110,14 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
// Remove all packages with the same name and architecture
for p := packageList.Search(debian.Dependency{Architecture: pkg.Architecture, Pkg: pkg.Name}); p != nil; {
packageList.Remove(p)
color.Printf("@r[-]@| %s removed", p)
fmt.Printf("\n")
context.progress.ColoredPrintf("@r[-]@| %s removed", p)
p = packageList.Search(debian.Dependency{Architecture: pkg.Architecture, Pkg: pkg.Name})
}
}
// Add new discovered package
packageList.Add(pkg)
color.Printf("@g[+]@| %s added", pkg)
fmt.Printf("\n")
context.progress.ColoredPrintf("@g[+]@| %s added", pkg)
if noDeps {
continue
@@ -133,8 +129,7 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
missing, err := pL.VerifyDependencies(context.dependencyOptions, []string{arch}, packageList)
if err != nil {
color.Printf("@y[!]@| @!Error while verifying dependencies for pkg %s: %s@|", pkg, err)
fmt.Printf("\n")
context.progress.ColoredPrintf("@y[!]@| @!Error while verifying dependencies for pkg %s: %s@|", pkg, err)
}
// Append missing dependencies to the list of dependencies to satisfy
@@ -155,7 +150,7 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
}
if cmd.Flag.Lookup("dry-run").Value.Get().(bool) {
fmt.Printf("\nNot creating snapshot, as dry run was requested.\n")
context.progress.Printf("\nNot creating snapshot, as dry run was requested.\n")
} else {
// Create <destination> snapshot
destination := debian.NewSnapshotFromPackageList(args[2], []*debian.Snapshot{snapshot, source}, packageList,
@@ -166,7 +161,7 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
return fmt.Errorf("unable to create snapshot: %s", err)
}
fmt.Printf("\nSnapshot %s successfully created.\nYou can run 'aptly publish snapshot %s' to publish snapshot as Debian repository.\n", destination.Name, destination.Name)
context.progress.Printf("\nSnapshot %s successfully created.\nYou can run 'aptly publish snapshot %s' to publish snapshot as Debian repository.\n", destination.Name, destination.Name)
}
return err
}

28
system/t05_snapshot/PullSnapshot10Test_gold
View File

@@ -5,20 +5,20 @@ from snapshot:
and result would be saved as new snapshot snap3.
Loading packages (76956)...
Building indexes...
[-] rsyslog_5.8.11-3_amd64 removed
[+] rsyslog_7.4.4-1~bpo70+1_amd64 added
[-] libestr0_0.1.1-2_amd64 removed
[+] libestr0_0.1.9-1~bpo70+1_amd64 added
[+] init-system-helpers_1.11~bpo70.1_all added
[-] rsyslog_5.8.11-3_source removed
[+] rsyslog_7.4.4-1~bpo70+1_source added
[-] libestr_0.1.1-2_source removed
[+] libestr_0.1.9-1~bpo70+1_source added
[+] init-system-helpers_1.11~bpo70.1_source added
[-] rsyslog_5.8.11-3_i386 removed
[+] rsyslog_7.4.4-1~bpo70+1_i386 added
[-] libestr0_0.1.1-2_i386 removed
[+] libestr0_0.1.9-1~bpo70+1_i386 added
[-] rsyslog_5.8.11-3_amd64 removed
[+] rsyslog_7.4.4-1~bpo70+1_amd64 added
[-] libestr0_0.1.1-2_amd64 removed
[+] libestr0_0.1.9-1~bpo70+1_amd64 added
[+] init-system-helpers_1.11~bpo70.1_all added
[-] rsyslog_5.8.11-3_source removed
[+] rsyslog_7.4.4-1~bpo70+1_source added
[-] libestr_0.1.1-2_source removed
[+] libestr_0.1.9-1~bpo70+1_source added
[+] init-system-helpers_1.11~bpo70.1_source added
[-] rsyslog_5.8.11-3_i386 removed
[+] rsyslog_7.4.4-1~bpo70+1_i386 added
[-] libestr0_0.1.1-2_i386 removed
[+] libestr0_0.1.9-1~bpo70+1_i386 added
Snapshot snap3 successfully created.
You can run 'aptly publish snapshot snap3' to publish snapshot as Debian repository.

10
system/t05_snapshot/PullSnapshot11Test_gold
View File

@@ -5,11 +5,11 @@ from snapshot:
and result would be saved as new snapshot snap3.
Loading packages (59249)...
Building indexes...
[+] rsyslog_7.4.4-1~bpo70+1_amd64 added
[+] libestr0_0.1.9-1~bpo70+1_amd64 added
[+] init-system-helpers_1.11~bpo70.1_all added
[+] rsyslog_7.4.4-1~bpo70+1_i386 added
[+] libestr0_0.1.9-1~bpo70+1_i386 added
[+] rsyslog_7.4.4-1~bpo70+1_amd64 added
[+] libestr0_0.1.9-1~bpo70+1_amd64 added
[+] init-system-helpers_1.11~bpo70.1_all added
[+] rsyslog_7.4.4-1~bpo70+1_i386 added
[+] libestr0_0.1.9-1~bpo70+1_i386 added
Snapshot snap3 successfully created.
You can run 'aptly publish snapshot snap3' to publish snapshot as Debian repository.

8
system/t05_snapshot/PullSnapshot1Test_gold
View File

@@ -5,10 +5,10 @@ from snapshot:
and result would be saved as new snapshot snap3.
Loading packages (56800)...
Building indexes...
[+] mame_0.146-5_amd64 added
[+] unrar_1:4.1.4-1_amd64 added
[+] mame_0.146-5_i386 added
[+] unrar_1:4.1.4-1_i386 added
[+] mame_0.146-5_amd64 added
[+] unrar_1:4.1.4-1_amd64 added
[+] mame_0.146-5_i386 added
[+] unrar_1:4.1.4-1_i386 added
Snapshot snap3 successfully created.
You can run 'aptly publish snapshot snap3' to publish snapshot as Debian repository.

18
system/t05_snapshot/PullSnapshot2Test_gold
View File

@@ -5,15 +5,15 @@ from snapshot:
and result would be saved as new snapshot snap3.
Loading packages (59249)...
Building indexes...
[-] rsyslog_5.8.11-3_amd64 removed
[+] rsyslog_7.4.4-1~bpo70+1_amd64 added
[-] libestr0_0.1.1-2_amd64 removed
[+] libestr0_0.1.9-1~bpo70+1_amd64 added
[+] init-system-helpers_1.11~bpo70.1_all added
[-] rsyslog_5.8.11-3_i386 removed
[+] rsyslog_7.4.4-1~bpo70+1_i386 added
[-] libestr0_0.1.1-2_i386 removed
[+] libestr0_0.1.9-1~bpo70+1_i386 added
[-] rsyslog_5.8.11-3_amd64 removed
[+] rsyslog_7.4.4-1~bpo70+1_amd64 added
[-] libestr0_0.1.1-2_amd64 removed
[+] libestr0_0.1.9-1~bpo70+1_amd64 added
[+] init-system-helpers_1.11~bpo70.1_all added
[-] rsyslog_5.8.11-3_i386 removed
[+] rsyslog_7.4.4-1~bpo70+1_i386 added
[-] libestr0_0.1.1-2_i386 removed
[+] libestr0_0.1.9-1~bpo70+1_i386 added
Snapshot snap3 successfully created.
You can run 'aptly publish snapshot snap3' to publish snapshot as Debian repository.

8
system/t05_snapshot/PullSnapshot3Test_gold
View File

@@ -5,10 +5,10 @@ from snapshot:
and result would be saved as new snapshot snap3.
Loading packages (59249)...
Building indexes...
[-] rsyslog_5.8.11-3_amd64 removed
[+] rsyslog_7.4.4-1~bpo70+1_amd64 added
[-] rsyslog_5.8.11-3_i386 removed
[+] rsyslog_7.4.4-1~bpo70+1_i386 added
[-] rsyslog_5.8.11-3_amd64 removed
[+] rsyslog_7.4.4-1~bpo70+1_amd64 added
[-] rsyslog_5.8.11-3_i386 removed
[+] rsyslog_7.4.4-1~bpo70+1_i386 added
Snapshot snap3 successfully created.
You can run 'aptly publish snapshot snap3' to publish snapshot as Debian repository.

18
system/t05_snapshot/PullSnapshot4Test_gold
View File

@@ -5,14 +5,14 @@ from snapshot:
and result would be saved as new snapshot snap3.
Loading packages (59249)...
Building indexes...
[-] rsyslog_5.8.11-3_amd64 removed
[+] rsyslog_7.4.4-1~bpo70+1_amd64 added
[-] libestr0_0.1.1-2_amd64 removed
[+] libestr0_0.1.9-1~bpo70+1_amd64 added
[+] init-system-helpers_1.11~bpo70.1_all added
[-] rsyslog_5.8.11-3_i386 removed
[+] rsyslog_7.4.4-1~bpo70+1_i386 added
[-] libestr0_0.1.1-2_i386 removed
[+] libestr0_0.1.9-1~bpo70+1_i386 added
[-] rsyslog_5.8.11-3_amd64 removed
[+] rsyslog_7.4.4-1~bpo70+1_amd64 added
[-] libestr0_0.1.1-2_amd64 removed
[+] libestr0_0.1.9-1~bpo70+1_amd64 added
[+] init-system-helpers_1.11~bpo70.1_all added
[-] rsyslog_5.8.11-3_i386 removed
[+] rsyslog_7.4.4-1~bpo70+1_i386 added
[-] libestr0_0.1.1-2_i386 removed
[+] libestr0_0.1.9-1~bpo70+1_i386 added
Not creating snapshot, as dry run was requested.

18
system/t05_snapshot/PullSnapshot7Test_gold
View File

@@ -5,13 +5,13 @@ from snapshot:
and result would be saved as new snapshot snap1.
Loading packages (59249)...
Building indexes...
[-] rsyslog_5.8.11-3_amd64 removed
[+] rsyslog_7.4.4-1~bpo70+1_amd64 added
[-] libestr0_0.1.1-2_amd64 removed
[+] libestr0_0.1.9-1~bpo70+1_amd64 added
[+] init-system-helpers_1.11~bpo70.1_all added
[-] rsyslog_5.8.11-3_i386 removed
[+] rsyslog_7.4.4-1~bpo70+1_i386 added
[-] libestr0_0.1.1-2_i386 removed
[+] libestr0_0.1.9-1~bpo70+1_i386 added
[-] rsyslog_5.8.11-3_amd64 removed
[+] rsyslog_7.4.4-1~bpo70+1_amd64 added
[-] libestr0_0.1.1-2_amd64 removed
[+] libestr0_0.1.9-1~bpo70+1_amd64 added
[+] init-system-helpers_1.11~bpo70.1_all added
[-] rsyslog_5.8.11-3_i386 removed
[+] rsyslog_7.4.4-1~bpo70+1_i386 added
[-] libestr0_0.1.1-2_i386 removed
[+] libestr0_0.1.9-1~bpo70+1_i386 added
ERROR: unable to create snapshot: snapshot with name snap1 already exists

8
system/t05_snapshot/PullSnapshot8Test_gold
View File

@@ -5,10 +5,10 @@ from snapshot:
and result would be saved as new snapshot snap3.
Loading packages (56800)...
Building indexes...
[!] Dependency lunar-landing [amd64] can't be satisfied with source [snap2]: Snapshot from mirror [wheezy-non-free]: http://mirror.yandex.ru/debian/ wheezy
[!] Dependency mars-landing (>= 1.0) [amd64] can't be satisfied with source [snap2]: Snapshot from mirror [wheezy-non-free]: http://mirror.yandex.ru/debian/ wheezy
[!] Dependency lunar-landing [i386] can't be satisfied with source [snap2]: Snapshot from mirror [wheezy-non-free]: http://mirror.yandex.ru/debian/ wheezy
[!] Dependency mars-landing (>= 1.0) [i386] can't be satisfied with source [snap2]: Snapshot from mirror [wheezy-non-free]: http://mirror.yandex.ru/debian/ wheezy
[!] Dependency lunar-landing [amd64] can't be satisfied with source [snap2]: Snapshot from mirror [wheezy-non-free]: http://mirror.yandex.ru/debian/ wheezy
[!] Dependency mars-landing (>= 1.0) [amd64] can't be satisfied with source [snap2]: Snapshot from mirror [wheezy-non-free]: http://mirror.yandex.ru/debian/ wheezy
[!] Dependency lunar-landing [i386] can't be satisfied with source [snap2]: Snapshot from mirror [wheezy-non-free]: http://mirror.yandex.ru/debian/ wheezy
[!] Dependency mars-landing (>= 1.0) [i386] can't be satisfied with source [snap2]: Snapshot from mirror [wheezy-non-free]: http://mirror.yandex.ru/debian/ wheezy
Snapshot snap3 successfully created.
You can run 'aptly publish snapshot snap3' to publish snapshot as Debian repository.

24
system/t05_snapshot/PullSnapshot9Test_gold
View File

@@ -5,18 +5,18 @@ from snapshot:
and result would be saved as new snapshot snap3.
Loading packages (59786)...
Building indexes...
[-] rsyslog_5.8.11-3_amd64 removed
[+] rsyslog_7.4.4-1~bpo70+1_amd64 added
[-] libestr0_0.1.1-2_amd64 removed
[+] libestr0_0.1.9-1~bpo70+1_amd64 added
[+] init-system-helpers_1.11~bpo70.1_all added
[+] rsyslog_7.4.4-1~bpo70+1_source added
[+] libestr_0.1.9-1~bpo70+1_source added
[+] init-system-helpers_1.11~bpo70.1_source added
[-] rsyslog_5.8.11-3_i386 removed
[+] rsyslog_7.4.4-1~bpo70+1_i386 added
[-] libestr0_0.1.1-2_i386 removed
[+] libestr0_0.1.9-1~bpo70+1_i386 added
[-] rsyslog_5.8.11-3_amd64 removed
[+] rsyslog_7.4.4-1~bpo70+1_amd64 added
[-] libestr0_0.1.1-2_amd64 removed
[+] libestr0_0.1.9-1~bpo70+1_amd64 added
[+] init-system-helpers_1.11~bpo70.1_all added
[+] rsyslog_7.4.4-1~bpo70+1_source added
[+] libestr_0.1.9-1~bpo70+1_source added
[+] init-system-helpers_1.11~bpo70.1_source added
[-] rsyslog_5.8.11-3_i386 removed
[+] rsyslog_7.4.4-1~bpo70+1_i386 added
[-] libestr0_0.1.1-2_i386 removed
[+] libestr0_0.1.9-1~bpo70+1_i386 added
Snapshot snap3 successfully created.
You can run 'aptly publish snapshot snap3' to publish snapshot as Debian repository.