From 6b067d7d20c10acb68d768003bf8031f155e5f39 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Mon, 1 Mar 2010 17:48:54 -0800
Subject: Move pass-3/4 cache checks after the reported pass-2 end

* main.cxx (main): Reorganize the end of pass-2 a bit.
---
 main.cxx | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'main.cxx')

diff --git a/main.cxx b/main.cxx
index 5255b5bf..04431e72 100644
--- a/main.cxx
+++ b/main.cxx
@@ -1275,9 +1275,17 @@ main (int argc, char * const argv [])
     cerr << "Pass 2: analysis failed.  "
          << "Try again with another '--vp 01' option."
          << endl;
+
+  /* Print out list of missing files.  XXX should be "if (rc)" ? */
+  missing_rpm_list_print(s);
+
+  STAP_PROBE1(stap, pass2__end, &s);
+
+  if (rc || s.listing_mode || s.last_pass == 2 || pending_interrupts) goto cleanup;
+
   // Generate hash.  There isn't any point in generating the hash
   // if last_pass is 2, since we'll quit before using it.
-  else if (s.last_pass != 2 && s.use_script_cache)
+  if (s.use_script_cache)
     {
       ostringstream o;
       unsigned saved_verbose;
@@ -1306,13 +1314,6 @@ main (int argc, char * const argv [])
 	}
     }
 
-  /* Print out list of missing files */
-  missing_rpm_list_print(s);
-
-  STAP_PROBE1(stap, pass2__end, &s);
-
-  if (rc || s.listing_mode || s.last_pass == 2 || pending_interrupts) goto cleanup;
-
   // PASS 3: TRANSLATION
   s.verbose = s.perpass_verbose[2];
   times (& tms_before);
-- 
cgit