From 4793424f3d5923d542db4517d7dad98bfc4d6db1 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Tue, 8 Oct 2024 11:10:49 +0300 Subject: [PATCH] Fixed error when installing new package --- main.go | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/main.go b/main.go index 9619279..e042b5e 100644 --- a/main.go +++ b/main.go @@ -273,15 +273,15 @@ func resolveCommand() { if installedInfo == nil { fmt.Printf("%s: %s (Install) %s\n", pkgInfo.Name, pkgInfo.GetFullVersion(), sourceInfo) - } - - comparison := utils.ComparePackageVersions(*pkgInfo, *installedInfo) - if comparison < 0 { - fmt.Printf("%s: %s -> %s (Downgrade) %s\n", pkgInfo.Name, installedInfo.GetFullVersion(), pkgInfo.GetFullVersion(), sourceInfo) - } else if comparison > 0 { - fmt.Printf("%s: %s -> %s (Upgrade) %s\n", pkgInfo.Name, installedInfo.GetFullVersion(), pkgInfo.GetFullVersion(), sourceInfo) } else { - fmt.Printf("%s: %s (Reinstall) %s\n", pkgInfo.Name, pkgInfo.GetFullVersion(), sourceInfo) + comparison := utils.ComparePackageVersions(*pkgInfo, *installedInfo) + if comparison < 0 { + fmt.Printf("%s: %s -> %s (Downgrade) %s\n", pkgInfo.Name, installedInfo.GetFullVersion(), pkgInfo.GetFullVersion(), sourceInfo) + } else if comparison > 0 { + fmt.Printf("%s: %s -> %s (Upgrade) %s\n", pkgInfo.Name, installedInfo.GetFullVersion(), pkgInfo.GetFullVersion(), sourceInfo) + } else { + fmt.Printf("%s: %s (Reinstall) %s\n", pkgInfo.Name, pkgInfo.GetFullVersion(), sourceInfo) + } } } if rootDir != "/" { @@ -386,19 +386,19 @@ func resolveCommand() { installedInfo := utils.GetPackageInfo(pkg, rootDir, true) if installedInfo == nil { log.Fatalf("Error: could not get package info for (%s)\n", pkg) - } - - comparison := utils.ComparePackageVersions(*entry.Info, *installedInfo) - if comparison > 0 { - toUpdate.Set(entry.Info.Name, &struct { - isDependency bool - entry *utils.RepositoryEntry - }{isDependency: false, entry: entry}) - } else if reinstall { - toUpdate.Set(entry.Info.Name, &struct { - isDependency bool - entry *utils.RepositoryEntry - }{isDependency: false, entry: entry}) + } else { + comparison := utils.ComparePackageVersions(*entry.Info, *installedInfo) + if comparison > 0 { + toUpdate.Set(entry.Info.Name, &struct { + isDependency bool + entry *utils.RepositoryEntry + }{isDependency: false, entry: entry}) + } else if reinstall { + toUpdate.Set(entry.Info.Name, &struct { + isDependency bool + entry *utils.RepositoryEntry + }{isDependency: false, entry: entry}) + } } } if toUpdate.Len() == 0 { @@ -445,13 +445,13 @@ func resolveCommand() { if installedInfo == nil { fmt.Printf("%s: %s (Install) %s\n", value.entry.Info.Name, value.entry.Info.GetFullVersion(), sourceInfo) continue - } - - comparison := utils.ComparePackageVersions(*value.entry.Info, *installedInfo) - if comparison > 0 { - fmt.Printf("%s: %s -> %s (Upgrade) %s\n", value.entry.Info.Name, installedInfo.GetFullVersion(), value.entry.Info.GetFullVersion(), sourceInfo) - } else if reinstall { - fmt.Printf("%s: %s -> %s (Reinstall) %s\n", value.entry.Info.Name, installedInfo.GetFullVersion(), value.entry.Info.GetFullVersion(), sourceInfo) + } else { + comparison := utils.ComparePackageVersions(*value.entry.Info, *installedInfo) + if comparison > 0 { + fmt.Printf("%s: %s -> %s (Upgrade) %s\n", value.entry.Info.Name, installedInfo.GetFullVersion(), value.entry.Info.GetFullVersion(), sourceInfo) + } else if reinstall { + fmt.Printf("%s: %s -> %s (Reinstall) %s\n", value.entry.Info.Name, installedInfo.GetFullVersion(), value.entry.Info.GetFullVersion(), sourceInfo) + } } }