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).

svn path=/main/trunk/; revision=9078

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 0c3a0eacbb1636fd75c0435e63f49a7d6aa405c2..ba45330b6ad9f70347dd6daeb9b2b55adb32c8ec 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -647,11 +647,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