Merge pull request #2841 from ActiveState/mitchell/dx-2277-2

Lack of having a commit ID for package operations is an error.
ActiveState · Oct 31, 2023 · 15eb4b9 · 15eb4b9
2 parents c3faef4 + 79d2522
commit 15eb4b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/internal/runbits/requirements/requirements.go b/internal/runbits/requirements/requirements.go
@@ -109,7 +109,7 @@ func (r *RequirementOperation) ExecuteRequirementOperation(requirementName, requ
 	switch nsType {
 	case model.NamespacePackage, model.NamespaceBundle:
 		commitID, err := localcommit.Get(r.Project.Dir())
-		if err != nil && !localcommit.IsFileDoesNotExistError(err) {
+		if err != nil {
 			return errs.Wrap(err, "Unable to get local commit")
 		}
 
@@ -191,7 +191,7 @@ func (r *RequirementOperation) ExecuteRequirementOperation(requirementName, requ
 	}
 
 	parentCommitID, err := localcommit.Get(r.Project.Dir())
-	if err != nil && !localcommit.IsFileDoesNotExistError(err) {
+	if err != nil {
 		return errs.Wrap(err, "Unable to get local commit")
 	}
 	hasParentCommit := parentCommitID != ""

diff --git a/test/integration/package_int_test.go b/test/integration/package_int_test.go
@@ -470,6 +470,11 @@ func (suite *PackageIntegrationTestSuite) TestJSON() {
 	cp.ExpectExitCode(0)
 	AssertValidJSON(suite.T(), cp)
 
+	cp = ts.Spawn("checkout", "ActiveState-CLI/Perl-5.32", ".")
+	cp.Expect("Skipping runtime setup")
+	cp.Expect("Checked out project")
+	cp.ExpectExitCode(0)
+
 	cp = ts.SpawnWithOpts(
 		e2e.OptArgs("checkout", "ActiveState-CLI/Packages-Perl", "."),
 		e2e.OptAppendEnv("ACTIVESTATE_CLI_DISABLE_RUNTIME=false"),