Date: Wed, 5 Dec 2012 06:54:08 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243879 - projects/portbuild/scripts Message-ID: <201212050654.qB56s8RX088371@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer) Date: Wed Dec 5 06:54:07 2012 New Revision: 243879 URL: http://svnweb.freebsd.org/changeset/base/243879 Log: Make more resistant to errors on initial setup. Modified: projects/portbuild/scripts/pollmachine Modified: projects/portbuild/scripts/pollmachine ============================================================================== --- projects/portbuild/scripts/pollmachine Wed Dec 5 06:36:00 2012 (r243878) +++ projects/portbuild/scripts/pollmachine Wed Dec 5 06:54:07 2012 (r243879) @@ -296,17 +296,20 @@ logging.getLogger('').addHandler(log_con while True: for arch in arches: + now = set() try: now = mlist[arch] except KeyError: mlistfile="%s/%s/mlist" % (pbd, arch) try: f = file(mlistfile, "r") + now=set(mach.rstrip() for mach in f.readlines()) + try: + f.close() + except: + pass except OSError, error: - raise - - now=set(mach.rstrip() for mach in f.readlines()) - f.close() + print "pollmachine: could not find %s, skipping" % mlistfile gone = machines[arch].difference(now) new = now.difference(machines[arch])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212050654.qB56s8RX088371>