Include installed package files in upgrade actions

src/bpm/main.go

@@ -240,11 +240,12 @@ func showPackageInfo() {
 
 	for n, pkg := range packages {
 		if showDatabaseInfo {
-			var err error
+			// Split package name and required version
-			var entry *bpmlib.BPMDatabaseEntry
+			pkgName, _, _ := bpmlib.SplitPkgNameAndVersion(pkg)
-			entry, _, err = bpmlib.GetDatabaseEntry(pkg)
+
+			entry, _, err := bpmlib.GetDatabaseEntry(pkgName)
 			if err != nil {
-				if providers := bpmlib.GetDatabaseVirtualPackageEntry(pkg); len(providers) > 0 {
+				if providers := bpmlib.GetDatabaseVirtualPackageEntry(pkgName); len(providers) > 0 {
 					entry = providers[0]
 				} else {
 					log.Printf("Error: could not find package (%s) in any database\n", pkg)
@@ -253,6 +254,12 @@ func showPackageInfo() {
 				}
 			}
 
+			if !bpmlib.EvaluateDependency(pkg, entry.Info.Version) {
+				log.Printf("Error: could not find package (%s) in any database\n", pkg)
+				exitCode = 1
+				continue
+			}
+
 			if n != 0 {
 				fmt.Println()
 			}
@@ -272,17 +279,28 @@ func showPackageInfo() {
 			}
 			isFile = true
 		} else {
-			if providers := bpmlib.GetVirtualPackageInfo(pkg, rootDir); len(providers) > 0 {
+			// Split package name and required version
+			pkgName, _, _ := bpmlib.SplitPkgNameAndVersion(pkg)
+
+			if providers := bpmlib.GetVirtualPackageInfo(pkgName, rootDir); len(providers) > 0 {
 				bpmpkg = bpmlib.GetPackage(providers[0].Name, rootDir)
 			} else {
-				bpmpkg = bpmlib.GetPackage(pkg, rootDir)
+				bpmpkg = bpmlib.GetPackage(pkgName, rootDir)
 			}
 		}
+
 		if bpmpkg == nil {
 			log.Printf("Error: package (%s) is not installed\n", pkg)
 			exitCode = 1
 			return
 		}
+
+		if !bpmlib.EvaluateDependency(pkg, bpmpkg.PkgInfo.Version) {
+			log.Printf("Error: package (%s) is not installed\n", pkg)
+			exitCode = 1
+			return
+		}
+
 		if n != 0 {
 			fmt.Println()
 		}

src/bpmlib/operations.go

@@ -649,10 +649,16 @@ func (operation *BPMOperation) GetModifiedFiles() {
 			installAction := action.(*InstallPackageAction)
 			isUpgrade := IsPackageInstalled(installAction.BpmPackage.PkgInfo.Name, operation.RootDir)
 
+			if isUpgrade {
+				for _, pkgFile := range installAction.BpmPackage.PkgFiles {
+					operation.ModifiedFiles[pkgFile.Path] = "upgrade"
+				}
+				for _, pkgFile := range GetPackage(installAction.BpmPackage.PkgInfo.Name, operation.RootDir).PkgFiles {
+					operation.ModifiedFiles[pkgFile.Path] = "upgrade"
+				}
+			} else {
 				for _, pkgFile := range installAction.BpmPackage.PkgFiles {
 					operation.ModifiedFiles[pkgFile.Path] = "install"
-				if isUpgrade {
-					operation.ModifiedFiles[pkgFile.Path] = "upgrade"
 				}
 			}
 		}