summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-01-11 20:39:53 +0000
committerZac Medico <zmedico@gentoo.org>2007-01-11 20:39:53 +0000
commitf851747006de67283c9d2d8cca53e76c4dc8d98a (patch)
tree3c07859b20fcd75e70bc38bed08ebf60fbf5e047
parent1ab64bdbd50c1591d67b72a790762e8c50a94838 (diff)
downloadportage-f851747006de67283c9d2d8cca53e76c4dc8d98a.tar.gz
portage-f851747006de67283c9d2d8cca53e76c4dc8d98a.tar.bz2
portage-f851747006de67283c9d2d8cca53e76c4dc8d98a.zip
For bug #50738, inform the user about the location of the timestamp file and that it can be removed to force sync.
svn path=/main/trunk/; revision=5565
-rwxr-xr-xbin/emerge4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge
index 3c89b4816..f65176b1d 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3855,6 +3855,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
print ">>> Timestamps on the server and in the local repository are the same."
print ">>> Cancelling all further sync action. You are already up to date."
print ">>>"
+ print ">>> In order to force sync, remove '%s'." % tmpservertimestampfile
+ print ">>>"
print
sys.exit(0)
elif (servertimestamp != 0) and (servertimestamp < mytimestamp):
@@ -3864,6 +3866,8 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
print ">>>"
print ">>> SERVER OUT OF DATE: %s" % dosyncuri
print ">>>"
+ print ">>> In order to force sync, remove '%s'." % tmpservertimestampfile
+ print ">>>"
print
elif (servertimestamp == 0) or (servertimestamp > mytimestamp):
# actual sync