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

Leave color reset on the same line.

Browse Source
This commit is contained in:
Andrey Smirnov
2014-01-24 18:33:03 +04:00
parent abc117531d
commit c3b3e580bd
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd_snapshot.go
+8 -4
View File
@@ -301,20 +301,23 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
// Search for package that can satisfy dependencies // Search for package that can satisfy dependencies
pkg := sourcePackageList.Search(dep) pkg := sourcePackageList.Search(dep)
if pkg == nil { if pkg == nil {
color.Printf("@y[!]@| @!Dependency %s can't be satisfied with source %s@|\n", &dep, source) color.Printf("@y[!]@| @!Dependency %s can't be satisfied with source %s@|", &dep, source)
fmt.Printf("\n")
continue continue
} }
// 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: arch, Pkg: pkg.Name}); p != nil; {
packageList.Remove(p) packageList.Remove(p)
color.Printf("@r[-]@| %s removed\n", p) color.Printf("@r[-]@| %s removed", p)
fmt.Printf("\n")
p = packageList.Search(debian.Dependency{Architecture: arch, Pkg: pkg.Name}) p = packageList.Search(debian.Dependency{Architecture: arch, Pkg: pkg.Name})
} }
// Add new discovered package // Add new discovered package
packageList.Add(pkg) packageList.Add(pkg)
color.Printf("@g[+]@| %s added\n", pkg) color.Printf("@g[+]@| %s added", pkg)
fmt.Printf("\n")
if noDeps { if noDeps {
continue continue
@@ -326,7 +329,8 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
missing, err := pL.VerifyDependencies(context.dependencyOptions, []string{arch}, packageList) missing, err := pL.VerifyDependencies(context.dependencyOptions, []string{arch}, packageList)
if err != nil { if err != nil {
color.Printf("@y[!]@| @!Error while verifying dependencies for pkg %s: %s@|\n", pkg, err) color.Printf("@y[!]@| @!Error while verifying dependencies for pkg %s: %s@|", pkg, err)
fmt.Printf("\n")
} }
// Append missing dependencies to the list of dependencies to satisfy // Append missing dependencies to the list of dependencies to satisfy