Convert octal literals to Python 2.6 syntax.

Signed-off-by: Torsten Werner <twerner@debian.org>

diff --git a/dak/clean_queues.py b/dak/clean_queues.py
index 6ade86c6a1c25e4e76a862d8b1a2f03e56072941..4147ab054533245ad21aab8cd8d0ae6c9dd8b182 100755 (executable)
--- a/dak/clean_queues.py
+++ b/dak/clean_queues.py
@@ -86,7 +86,7 @@ def init (cnf):
     # Ensure a directory exists to remove files to
     if not Options["No-Action"]:
         if not os.path.exists(del_dir):
-            os.makedirs(del_dir, 02775)
+            os.makedirs(del_dir, 0o2775)
         if not os.path.isdir(del_dir):
             utils.fubar("%s must be a directory." % (del_dir))
 
@@ -118,7 +118,7 @@ def remove (from_dir, f):
         if os.path.exists(dest_filename):
             dest_filename = utils.find_next_free(dest_filename, 10)
             Logger.log(["change destination file name", os.path.basename(dest_filename)])
-        utils.move(f, dest_filename, 0660)
+        utils.move(f, dest_filename, 0o660)
     else:
         Logger.log(["skipping file because of permission problem", fname])
         utils.warn("skipping '%s', permission denied." % fname)

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 83d51824cdcb05efe37d8143b88eead762c58f3a..75142ca78eab2cfc494145b7542d43f5d9bd15e1 100755 (executable)
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -280,7 +280,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
 def main():
     global Cnf, Options, Logger
 
-    os.umask(0002)
+    os.umask(0o002)
 
     Cnf = utils.get_conf()
     Arguments = [ ('h', "help", "Generate-Index-Diffs::Options::Help"),

diff --git a/dak/init_dirs.py b/dak/init_dirs.py
index a4703bb88b5170ef8597ea18d3eb675bacf23a0a..fc5efd3206948cdca6ece9c2b03b7fe394633429 100755 (executable)
--- a/dak/init_dirs.py
+++ b/dak/init_dirs.py
@@ -90,15 +90,15 @@ def process_keyring(fullpath, secret=False):
         os.makedirs(keydir)
         if secret:
             # Make sure secret keyring directories are 0700
-            os.chmod(keydir, 0700)
+            os.chmod(keydir, 0o700)
 
     # Touch the file
     print "Creating %s ..." % (fullpath)
     file(fullpath, 'w')
     if secret:
-        os.chmod(fullpath, 0600)
+        os.chmod(fullpath, 0o600)
     else:
-        os.chmod(fullpath, 0644)
+        os.chmod(fullpath, 0o644)
 
 ######################################################################
 

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 2b6cd71e60a98efcf265e62231b8817dfa2e914b..7352f71ea928d6bec94ee0b9654d339b174fa3f1 100755 (executable)
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -214,7 +214,7 @@ def get_upload_data(changesfn):
                     os.unlink(lfn)
                 if os.path.exists(qfn):
                     os.symlink(qfn,lfn)
-                    os.chmod(qfn, 0644)
+                    os.chmod(qfn, 0o644)
     return (max(delaydays-1,0)*24*60*60+remainingtime, changesname, delay, uploader, achanges.get('closes','').split(),achanges, delaydays)
 
 def list_uploads(filelist, rrd_dir):

diff --git a/dak/transitions.py b/dak/transitions.py
index 9d21a562ce68db8d548dc09ad0e0fc7fb71838f0..a5b8fa3529edda25a90f5bab80ebcd2f98b0e8e7 100755 (executable)
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -319,7 +319,7 @@ def temp_transitions_file(transitions):
     """
 
     (fd, path) = tempfile.mkstemp("", "transitions", Cnf["Dir::TempPath"])
-    os.chmod(path, 0644)
+    os.chmod(path, 0o644)
     f = open(path, "w")
     yaml.dump(transitions, f, default_flow_style=False)
     return path

diff --git a/daklib/daklog.py b/daklib/daklog.py
index 7ececa560ebc74f5405dfc8f73a571b77691a9ca..05ca9b1adaab9770ae6048956b1df1fda00a5e13 100644 (file)
--- a/daklib/daklog.py
+++ b/daklib/daklog.py
@@ -55,7 +55,7 @@ class Logger(object):
         logdir = Config()["Dir::Log"]
         if not os.path.exists(logdir):
             umask = os.umask(00000)
-            os.makedirs(logdir, 02775)
+            os.makedirs(logdir, 0o2775)
             os.umask(umask)
 
         # Open the logfile
@@ -65,7 +65,7 @@ class Logger(object):
         if debug:
             logfile = sys.stderr
         else:
-            umask = os.umask(00002)
+            umask = os.umask(0o0002)
             logfile = utils.open_file(logfilename, 'a')
             os.umask(umask)
 

diff --git a/daklib/filewriter.py b/daklib/filewriter.py
index b44fc2a5775c0fac1e21cb56af3585c6691a31ab..274ef5c12dadc8b6ab6a921c9680770f1628b48c 100755 (executable)
--- a/daklib/filewriter.py
+++ b/daklib/filewriter.py
@@ -65,7 +65,7 @@ class BaseFileWriter(object):
     # internal helper function
     def rename(self, filename):
         tempfilename = filename + '.new'
-        os.chmod(tempfilename, 0664)
+        os.chmod(tempfilename, 0o664)
         os.rename(tempfilename, filename)
 
     def close(self):

diff --git a/daklib/holding.py b/daklib/holding.py
index 221a25775a2832bcbea206ad18ffb7e9700687c3..6c9ce570a863319bde2e3bef679ddcbe264f94eb 100644 (file)
--- a/daklib/holding.py
+++ b/daklib/holding.py
@@ -58,7 +58,7 @@ class Holding(object):
 
         dest = os.path.join(self.holding_dir, base_filename)
         try:
-            fd = os.open(dest, os.O_RDWR | os.O_CREAT | os.O_EXCL, 0640)
+            fd = os.open(dest, os.O_RDWR | os.O_CREAT | os.O_EXCL, 0o640)
             os.close(fd)
         except OSError as e:
             # Shouldn't happen, but will if, for example, someone lists a

diff --git a/daklib/queue.py b/daklib/queue.py
index 12e027190d32fb61bc98bf2ad2e3fb9c92c8f05e..fa4a95f4b33354ab2d47a8b03baeb20dd02b1e4e 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -2225,7 +2225,7 @@ distribution."""
                 filename = "%s/%s" % (cnf["Dir::BTSVersionTrack"],
                                       self.pkg.changes_file[:-8]+".versions")
                 os.rename(temp_filename, filename)
-                os.chmod(filename, 0644)
+                os.chmod(filename, 0o644)
 
             # Write out the binary -> source mapping.
             (fd, temp_filename) = utils.temp_filename(cnf["Dir::BTSVersionTrack"], prefix=".")
@@ -2240,7 +2240,7 @@ distribution."""
             filename = "%s/%s" % (cnf["Dir::BTSVersionTrack"],
                                   self.pkg.changes_file[:-8]+".debinfo")
             os.rename(temp_filename, filename)
-            os.chmod(filename, 0644)
+            os.chmod(filename, 0o644)
 
         session.commit()
 
@@ -2342,7 +2342,7 @@ distribution."""
             dest_file = os.path.join(cnf["Dir::Reject"], file_entry)
 
             try:
-                dest_fd = os.open(dest_file, os.O_RDWR | os.O_CREAT | os.O_EXCL, 0644)
+                dest_fd = os.open(dest_file, os.O_RDWR | os.O_CREAT | os.O_EXCL, 0o644)
             except OSError as e:
                 # File exists?  Let's find a new name by adding a number
                 if e.errno == errno.EEXIST:
@@ -2356,7 +2356,7 @@ distribution."""
 
                     # Make sure we really got it
                     try:
-                        dest_fd = os.open(dest_file, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0644)
+                        dest_fd = os.open(dest_file, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0o644)
                     except OSError as e:
                         # Likewise
                         utils.warn("**WARNING** failed to claim %s in the reject directory." % (file_entry))
@@ -2365,7 +2365,7 @@ distribution."""
                     raise
             # If we got here, we own the destination file, so we can
             # safely overwrite it.
-            utils.move(file_entry, dest_file, 1, perms=0660)
+            utils.move(file_entry, dest_file, 1, perms=0o660)
             os.close(dest_fd)
 
     ###########################################################################
@@ -2431,7 +2431,7 @@ distribution."""
         # so let's just raise an exception ...
         if os.path.exists(reason_filename):
             os.unlink(reason_filename)
-        reason_fd = os.open(reason_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0644)
+        reason_fd = os.open(reason_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0o644)
 
         rej_template = os.path.join(cnf["Dir::Templates"], "queue.rejected")
 

diff --git a/daklib/utils.py b/daklib/utils.py
index 46387ff2e14e55ed35ad1a311b7f393f94b29f51..6f352cd0c8b6157b27f631c1db26a688349785fd 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -687,7 +687,7 @@ def send_mail (message, filename=""):
                     os.unlink (filename);
                 return;
 
-        fd = os.open(filename, os.O_RDWR|os.O_EXCL, 0700);
+        fd = os.open(filename, os.O_RDWR|os.O_EXCL, 0o700);
         os.write (fd, message_raw.as_string(True));
         os.close (fd);
 
@@ -712,14 +712,14 @@ def poolify (source, component):
 
 ################################################################################
 
-def move (src, dest, overwrite = 0, perms = 0664):
+def move (src, dest, overwrite = 0, perms = 0o664):
     if os.path.exists(dest) and os.path.isdir(dest):
         dest_dir = dest
     else:
         dest_dir = os.path.dirname(dest)
     if not os.path.exists(dest_dir):
         umask = os.umask(00000)
-        os.makedirs(dest_dir, 02775)
+        os.makedirs(dest_dir, 0o2775)
         os.umask(umask)
     #print "Moving %s to %s..." % (src, dest)
     if os.path.exists(dest) and os.path.isdir(dest):
@@ -735,14 +735,14 @@ def move (src, dest, overwrite = 0, perms = 0664):
     os.chmod(dest, perms)
     os.unlink(src)
 
-def copy (src, dest, overwrite = 0, perms = 0664):
+def copy (src, dest, overwrite = 0, perms = 0o664):
     if os.path.exists(dest) and os.path.isdir(dest):
         dest_dir = dest
     else:
         dest_dir = os.path.dirname(dest)
     if not os.path.exists(dest_dir):
         umask = os.umask(00000)
-        os.makedirs(dest_dir, 02775)
+        os.makedirs(dest_dir, 0o2775)
         os.umask(umask)
     #print "Copying %s to %s..." % (src, dest)
     if os.path.exists(dest) and os.path.isdir(dest):