From 0e5a9bf95d5b9b3c775ed3ce6142d35815a7c7ac Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Sat, 23 May 2020 16:55:59 +0200
Subject: Don't set variables to conditionally override them 2 lines later

Gbp-Dch: Ignore
---
 apt-pkg/depcache.cc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'apt-pkg')

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index aa10d8282..0f86640d5 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -2010,22 +2010,24 @@ void pkgDepCache::StateCache::Update(PkgIterator Pkg,pkgCache &Cache)
 {
    // Some info
    VerIterator Ver = CandidateVerIter(Cache);
-   
+
    // Use a null string or the version string
    if (Ver.end() == true)
       CandVersion = "";
    else
       CandVersion = Ver.VerStr();
-   
+
    // Find the current version
-   CurVersion = "";
    if (Pkg->CurrentVer != 0)
       CurVersion = Pkg.CurrentVer().VerStr();
+   else
+      CurVersion = "";
 
    // Figure out if its up or down or equal
-   Status = Ver.CompareVer(Pkg.CurrentVer());
    if (Pkg->CurrentVer == 0 || Pkg->VersionList == 0 || CandidateVer == 0)
-     Status = 2;      
+      Status = 2;
+   else
+      Status = Ver.CompareVer(Pkg.CurrentVer());
 }
 									/*}}}*/
 // Policy::GetCandidateVer - Returns the Candidate install version	/*{{{*/
-- 
cgit v1.2.3