commit: 01c4051e0870a78214c85811737edbff9f8e4b20
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 00:49:36 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 00:49:36 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=01c4051e
convert octals to py3 compat
catalyst/base/clearbase.py | 4 ++--
catalyst/base/resume.py | 4 ++--
catalyst/base/stagebase.py | 14 +++++++-------
catalyst/fileops.py | 2 +-
catalyst/targets/netboot2.py | 2 +-
catalyst/targets/snapshot.py | 2 +-
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/catalyst/base/clearbase.py b/catalyst/base/clearbase.py
index 3817196..9a4c625 100644
--- a/catalyst/base/clearbase.py
+++ b/catalyst/base/clearbase.py
@@ -30,13 +30,13 @@ class ClearBase(object):
def clear_chroot(self):
self.chroot_lock.unlock()
log.notice('Clearing the chroot path ...')
- clear_dir(self.settings["chroot_path"], 0755, True)
+ clear_dir(self.settings["chroot_path"], 0o755, True)
def remove_chroot(self):
self.chroot_lock.unlock()
log.notice('Removing the chroot path ...')
- clear_dir(self.settings["chroot_path"], 0755, True, remove=True)
+ clear_dir(self.settings["chroot_path"], 0o755, True,
remove=True)
def clear_packages(self, remove=False):
diff --git a/catalyst/base/resume.py b/catalyst/base/resume.py
index 99d8abc..70d9a4f 100644
--- a/catalyst/base/resume.py
+++ b/catalyst/base/resume.py
@@ -25,7 +25,7 @@ class AutoResume(object):
'''
- def __init__(self, basedir, mode=0755):
+ def __init__(self, basedir, mode=0o755):
self.basedir = basedir
ensure_dirs(basedir, mode=mode, fatal=True)
self._points = {}
@@ -131,7 +131,7 @@ class AutoResume(object):
@remove: boolean, passed through to clear_dir()
@return boolean
'''
- if clear_dir(self.basedir, mode=0755, chg_flags=True,
remove=remove):
+ if clear_dir(self.basedir, mode=0o755, chg_flags=True,
remove=remove):
self._points = {}
return True
return False
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 4a0b482..438e4d3 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -492,7 +492,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
))
if "autoresume" in self.settings["options"]:
log.info('The autoresume path is %s',
self.settings['autoresume_path'])
- self.resume = AutoResume(self.settings["autoresume_path"],
mode=0755)
+ self.resume = AutoResume(self.settings["autoresume_path"],
mode=0o755)
def set_controller_file(self):
self.settings["controller_file"]=normpath(self.settings["sharedir"]+\
@@ -773,10 +773,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
ensure_dirs(self.settings["chroot_path"]+"/tmp",mode=1777)
if "pkgcache" in self.settings["options"]:
-
ensure_dirs(self.settings["pkgcache_path"],mode=0755)
+
ensure_dirs(self.settings["pkgcache_path"],mode=0o755)
if "kerncache" in self.settings["options"]:
-
ensure_dirs(self.settings["kerncache_path"],mode=0755)
+
ensure_dirs(self.settings["kerncache_path"],mode=0o755)
log.notice('%s', display_msg % unpack_info)
@@ -848,7 +848,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
cleanup_cmd = "rm -rf " + target_portdir
log.info('unpack() cleanup_cmd = %s',
cleanup_cmd)
cmd(cleanup_cmd,cleanup_errmsg,env=self.env)
- ensure_dirs(target_portdir, mode=0755)
+ ensure_dirs(target_portdir, mode=0o755)
log.notice('Unpacking portage tree (this can take a
long time) ...')
if not self.decompressor.extract(unpack_info):
@@ -932,11 +932,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
_cmd = ''
log.debug('bind(); x = %s', x)
target = normpath(self.settings["chroot_path"] +
self.target_mounts[x])
- ensure_dirs(target, mode=0755)
+ ensure_dirs(target, mode=0o755)
if not os.path.exists(self.mountmap[x]):
if self.mountmap[x] not in ["tmpfs", "shmfs"]:
- ensure_dirs(self.mountmap[x], mode=0755)
+ ensure_dirs(self.mountmap[x],
mode=0o755)
src=self.mountmap[x]
log.debug('bind(); src = %s', src)
@@ -1218,7 +1218,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
# the proper perms and ownership
mystat=os.stat(myemp)
shutil.rmtree(myemp)
- ensure_dirs(myemp, mode=0755)
+ ensure_dirs(myemp, mode=0o755)
os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
os.chmod(myemp,mystat[ST_MODE])
self.resume.enable("empty")
diff --git a/catalyst/fileops.py b/catalyst/fileops.py
index 8fb2a36..1ef6b4c 100644
--- a/catalyst/fileops.py
+++ b/catalyst/fileops.py
@@ -37,7 +37,7 @@ def ensure_dirs(path, gid=-1, uid=-1, mode=0o755,
minimal=True,
:param mode: permissions to set any created directories to
:param minimal: boolean controlling whether or not the specified mode
must be enforced, or is the minimal permissions necessary. For
example,
- if mode=0755, minimal=True, and a directory exists with mode
0707,
+ if mode=0o755, minimal=True, and a directory exists with mode
0707,
this will restore the missing group perms resulting in 757.
:param failback: function to run in the event of a failed attemp
to create the directory.
diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py
index d882a06..8644786 100644
--- a/catalyst/targets/netboot2.py
+++ b/catalyst/targets/netboot2.py
@@ -157,7 +157,7 @@ class netboot2(StageBase):
# the proper perms and ownership
mystat=os.stat(myemp)
shutil.rmtree(myemp)
- ensure_dirs(myemp, mode=0755)
+ ensure_dirs(myemp, mode=0o755)
os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
os.chmod(myemp,mystat[ST_MODE])
self.resume.enable("empty")
diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index d19f4ef..dbc4b1c 100644
--- a/catalyst/targets/snapshot.py
+++ b/catalyst/targets/snapshot.py
@@ -106,6 +106,6 @@ class snapshot(TargetBase, GenBase):
if os.uname()[0] == "FreeBSD":
os.system("chflags -R noschg "+myemp)
shutil.rmtree(myemp)
- ensure_dirs(myemp, mode=0755)
+ ensure_dirs(myemp, mode=0o755)
os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
os.chmod(myemp,mystat[ST_MODE])
