Fixed time issues in repoman.

3 files changed, 8 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index a9f8329..d1a45e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for Portage; the Gentoo Linux ports system 
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.796.2.45 2005/01/11 22:04:55 carpaski Exp $
+# $Id: ChangeLog,v 1.796.2.46 2005/01/12 04:47:52 carpaski Exp $
 
   MAJOR CHANGES in 2.0.51:
     1. /var/cache/edb/virtuals is no longer used at all. It's calculated now.
@@ -9,6 +9,9 @@
 
 *portage-2.0.51-r10 (11 Jan 2004): Cleanup
 
+  12 Jan 2004; Nicholas Jones <carpaski@gentoo.org> repoman: Fixed the
+  namespace collision in the time module and calls.
+
   11 Jan 2004; Nicholas Jones <carpaski@gentoo.org> ebuild.sh: Fixes for the
   libdir patch -- libtool can't handle "usr//lib".
 
diff --git a/bin/emerge b/bin/emerge
index 8c25222..177afa8 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.10 2005/01/11 03:40:57 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/emerge,v 1.345.2.11 2005/01/12 04:47:52 carpaski Exp $
 
 import os,sys
 os.environ["PORTAGE_CALLER"]="emerge"
@@ -2601,7 +2601,7 @@ if myaction in ["sync","rsync","metadata"] and (not "--help" in myopts):
 		pcntstr=""
 		pcntcount=len(mynodes)/100.0
 		nextupdate=pcntcount
-		current=0
+		current=1
 		for x in mynodes:
 			current += 1
 			if current >= nextupdate:
diff --git a/bin/repoman b/bin/repoman
index 236eea1..9c0a0e6 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1,7 +1,7 @@
 #!/usr/bin/python -O
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/repoman,v 1.98.2.6 2005/01/11 03:40:57 carpaski Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/repoman,v 1.98.2.7 2005/01/12 04:47:52 carpaski Exp $
 
 # Next to do: dep syntax checking in mask files
 # Then, check to make sure deps are satisfiable (to avoid "can't find match for" problems)
@@ -22,7 +22,6 @@ import cvstree
 import time
 from output import *
 from commands import getstatusoutput
-from time import *
 from fileinput import input
 from grp import getgrnam
 from stat import *
@@ -575,7 +574,7 @@ else:
 		# if it's been over a week since fetching (or the system clock is fscked), grab an updated copy of metadata.dtd 
 		# clock is fscked or it's been a week. time to grab a new one.
 		ct=os.stat(portage.CACHE_PATH + '/metadata.dtd')[ST_CTIME]
-		if abs(time() - ct) > (60*60*24*7):
+		if abs(time.time() - ct) > (60*60*24*7):
 			# don't trap the exception, we're watching for errno 2 (file not found), anything else is a bug.
 			backup_exists=1
 		else: