summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-03-16 12:47:10 (GMT)
committerGerrit Code Review <gerrit@baserock.org>2015-03-16 12:47:10 (GMT)
commite763aa20569578bdd95fb2a97c16fa3d6e4d9834 (patch)
tree46fa762d32735cfdcd77dcc414f54ab0beacd1b8
parent2cdf37e721175e6f59a10971ee49cdd66f4e3419 (diff)
parent5903c4ea34849985b62d2f67423ae2bd32d7d13b (diff)
downloadmorph-e763aa20569578bdd95fb2a97c16fa3d6e4d9834.tar.gz
Merge "Use python3 compatible notation for octal constants"
-rw-r--r--morphlib/buildbranch.py4
-rw-r--r--morphlib/builder.py4
-rw-r--r--morphlib/extensions.py4
-rw-r--r--morphlib/plugins/cross-bootstrap_plugin.py6
-rw-r--r--morphlib/writeexts.py2
5 files changed, 10 insertions, 10 deletions
diff --git a/morphlib/buildbranch.py b/morphlib/buildbranch.py
index 2482bc9..ae11870 100644
--- a/morphlib/buildbranch.py
+++ b/morphlib/buildbranch.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014 Codethink Limited
+# Copyright (C) 2013-2015 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -115,7 +115,7 @@ class BuildBranch(object):
for morphology in morphologies:
loader.unset_defaults(morphology)
sha1 = gd.store_blob(loader.save_to_string(morphology))
- yield 0100644, sha1, morphology.filename
+ yield 0o100644, sha1, morphology.filename
def inject_build_refs(self, loader, use_local_repos,
inject_cb=lambda **kwargs: None):
diff --git a/morphlib/builder.py b/morphlib/builder.py
index 0bb2143..c8171d5 100644
--- a/morphlib/builder.py
+++ b/morphlib/builder.py
@@ -406,7 +406,7 @@ class ChunkBuilder(BuilderBase):
with morphlib.savefile.SaveFile(script_path, 'w') as f:
f.write("#!/bin/sh\nset -xeu\n")
f.write(script)
- os.chmod(script_path, 0555)
+ os.chmod(script_path, 0o555)
rel_script_path = os.path.join(SYSTEM_INTEGRATION_PATH,
script_name)
@@ -624,7 +624,7 @@ class SystemBuilder(BuilderBase): # pragma: no cover
f.write('SUPPORT_URL="http://wiki.baserock.org/mailinglist"\n')
f.write('BUG_REPORT_URL="http://wiki.baserock.org/mailinglist"\n')
- os.chmod(os_release_file, 0644)
+ os.chmod(os_release_file, 0o644)
def run_system_integration_commands(self, rootdir): # pragma: no cover
''' Run the system integration commands '''
diff --git a/morphlib/extensions.py b/morphlib/extensions.py
index 051a54a..c5e91f8 100644
--- a/morphlib/extensions.py
+++ b/morphlib/extensions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Codethink Limited
+# Copyright (C) 2014-2015 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -149,7 +149,7 @@ class get_extension_filename():
fd, ext_filename = tempfile.mkstemp()
os.write(fd, ext_contents)
os.close(fd)
- os.chmod(ext_filename, 0700)
+ os.chmod(ext_filename, 0o700)
self.delete = True
self.ext_filename = ext_filename
diff --git a/morphlib/plugins/cross-bootstrap_plugin.py b/morphlib/plugins/cross-bootstrap_plugin.py
index 2b5c891..819db0f 100644
--- a/morphlib/plugins/cross-bootstrap_plugin.py
+++ b/morphlib/plugins/cross-bootstrap_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014 Codethink Limited
+# Copyright (C) 2013-2015 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -111,7 +111,7 @@ class BootstrapSystemBuilder(morphlib.builder.BuilderBase):
chunk_script = os.path.join(path, 'src', 'build-%s' % name)
with morphlib.savefile.SaveFile(chunk_script, 'w') as f:
self.write_chunk_build_script(s, f)
- os.chmod(chunk_script, 0777)
+ os.chmod(chunk_script, 0o777)
def write_build_script(self, path):
'''Output a script to run build on the bootstrap target'''
@@ -136,7 +136,7 @@ class BootstrapSystemBuilder(morphlib.builder.BuilderBase):
f.write('if [ -e /sbin/ldconfig ]; then /sbin/ldconfig; fi\n')
f.write(driver_footer)
- os.chmod(driver_script, 0777)
+ os.chmod(driver_script, 0o777)
def write_chunk_build_script(self, source, f):
m = source.morphology
diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py
index ab451d1..9f166d7 100644
--- a/morphlib/writeexts.py
+++ b/morphlib/writeexts.py
@@ -360,7 +360,7 @@ class WriteExtension(cliapp.Application):
self.status(msg='Creating %s subvolume' % state_subdir)
subvolume = os.path.join(mountpoint, 'state', state_subdir)
cliapp.runcmd(['btrfs', 'subvolume', 'create', subvolume])
- os.chmod(subvolume, 0755)
+ os.chmod(subvolume, 0o755)
existing_state_dir = os.path.join(system_dir, state_subdir)
files = []