From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9B88013888F for ; Thu, 8 Oct 2015 21:29:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B43DE080E; Thu, 8 Oct 2015 21:29:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C12C4E080E for ; Thu, 8 Oct 2015 21:29:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id D2EF834073B for ; Thu, 8 Oct 2015 21:29:14 +0000 (UTC) From: Mike Frysinger To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH] support: use snakeoil.fileutils.touch Date: Thu, 8 Oct 2015 17:29:12 -0400 Message-Id: <1444339752-5445-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 2.5.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: 94221888-3d3b-405d-beac-8d0a7c44be3d X-Archives-Hash: 2e5ae7d2e2378198348776b3ba9d3809 No point in duplicating our own when snakeoil provides a better one. --- catalyst/base/resume.py | 5 +++-- catalyst/base/stagebase.py | 6 ++++-- catalyst/support.py | 8 -------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/catalyst/base/resume.py b/catalyst/base/resume.py index e3f03e7..443b46d 100644 --- a/catalyst/base/resume.py +++ b/catalyst/base/resume.py @@ -15,8 +15,9 @@ import os import sys import traceback +from snakeoil import fileutils + from catalyst.fileops import ensure_dirs, pjoin, listdir_files, clear_dir -from catalyst.support import touch class AutoResumeError(Exception): @@ -69,7 +70,7 @@ class AutoResume(object): myf.write(data) else: try: - touch(fname) + fileutils.touch(fname) self._points[point] = fname except Exception as e: print AutoResumeError(str(e)) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 813e5f1..f81c51b 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -9,12 +9,14 @@ from stat import ST_UID, ST_GID, ST_MODE # for convienience pjoin = os.path.join +from snakeoil import fileutils + from DeComp.compress import CompressMap from catalyst.defaults import (SOURCE_MOUNT_DEFAULTS, TARGET_MOUNT_DEFAULTS, PORT_LOGDIR_CLEAN) from catalyst.support import (CatalystError, msg, file_locate, normpath, - touch, cmd, warn, list_bashify, read_makeconf, read_from_clst, ismount, + cmd, warn, list_bashify, read_makeconf, read_from_clst, ismount, file_check) from catalyst.base.targetbase import TargetBase from catalyst.base.clearbase import ClearBase @@ -1513,7 +1515,7 @@ class StageBase(TargetBase, ClearBase, GenBase): cmd(self.settings["controller_file"]+\ " build_packages "+mypack,\ "Error in attempt to build packages",env=self.env) - touch(build_packages_resume) + fileutils.touch(build_packages_resume) self.resume.enable("build_packages") except CatalystError: self.unbind() diff --git a/catalyst/support.py b/catalyst/support.py index 1207d36..960a91d 100644 --- a/catalyst/support.py +++ b/catalyst/support.py @@ -250,14 +250,6 @@ def addl_arg_parse(myspec,addlargs,requiredspec,validspec): raise CatalystError('\n\tAlso: '.join(messages)) -def touch(myfile): - try: - myf=open(myfile,"w") - myf.close() - except IOError: - raise CatalystError("Could not touch "+myfile+".", print_traceback=True) - - def countdown(secs=5, doing="Starting"): if secs: print ">>> Waiting",secs,"seconds before starting..." -- 2.5.2