Just ignore it when the global counter file does not match

the highest installed COUNTER since it's normal for them to
differ in some cases. For example, the global counter file
will contain a higher value if the user merges a package and
then immediately unmerges it (unmerge does not update the
global counter file, but merge does). (trunk r9078)

svn path=/main/branches/2.1.2/; revision=9079

diff --git a/pym/portage.py b/pym/portage.py
index a6a0aee42b7e2322b5bb30619d34dd9e8141f9a5..e63ec480ec12b7d09da29bd19014e1076d409ab1 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6553,11 +6553,6 @@ class vardbapi(dbapi):
                        writemsg("!!! Initializing COUNTER to " + \
                                "value of %d\n" % counter, noiselevel=-1)
 
-               if counter != real_counter:
-                       changed = True
-                       writemsg("!!! Initializing COUNTER to " + \
-                               "value of %d\n" % real_counter, noiselevel=-1)
-
                # Never trust the counter file, since having a
                # corrupt value that is too low there can trigger
                # incorrect AUTOCLEAN behavior due to newly installed