added 1 changeset to branch 'refs/remotes/HaikuPM-github/package-management' old head: b53a2e6af53a5f375e63a50c4a021bb8967cb2d7 new head: c159d0cfd1574d6b39482b4d6f7b3bb4187ab1c5 overview: https://github.com/haiku/HaikuPM/compare/b53a2e6...c159d0c ---------------------------------------------------------------------------- c159d0c: BActivationTransaction: Fix unarchiving constructor [ Ingo Weinhold <ingo_weinhold@xxxxxx> ] ---------------------------------------------------------------------------- Commit: c159d0cfd1574d6b39482b4d6f7b3bb4187ab1c5 Author: Ingo Weinhold <ingo_weinhold@xxxxxx> Date: Wed Sep 11 03:07:14 2013 UTC ---------------------------------------------------------------------------- 1 file changed, 4 insertions(+), 4 deletions(-) src/kits/package/ActivationTransaction.cpp | 8 ++++---- ---------------------------------------------------------------------------- diff --git a/src/kits/package/ActivationTransaction.cpp b/src/kits/package/ActivationTransaction.cpp index de9b80f..2a73b02 100644 --- a/src/kits/package/ActivationTransaction.cpp +++ b/src/kits/package/ActivationTransaction.cpp @@ -41,12 +41,12 @@ BActivationTransaction::BActivationTransaction(BMessage* archive, status_t error; int32 location; if ((error = archive->FindInt32("location", &location)) == B_OK - || (error = archive->FindInt64("change count", &fChangeCount)) == B_OK - || (error = archive->FindString("transaction", + && (error = archive->FindInt64("change count", &fChangeCount)) == B_OK + && (error = archive->FindString("transaction", &fTransactionDirectoryName)) == B_OK - || (error = _ExtractStringList(archive, "activate", + && (error = _ExtractStringList(archive, "activate", fPackagesToActivate)) == B_OK - || (error = _ExtractStringList(archive, "deactivate", + && (error = _ExtractStringList(archive, "deactivate", fPackagesToDeactivate)) == B_OK) { if (location >= 0 && location <= B_PACKAGE_INSTALLATION_LOCATION_ENUM_COUNT) {