[Git][ftp-team/dak][master] 2 commits: clean: call `stat` only once for to-be-removed files

Ansgar pushed to branch master at Debian FTP Team / dak

Commits:

5e14f9e2

by Ansgar at 2020-12-29T23:50:48+01:00

clean: call `stat` only once for to-be-removed files

This also reduces the indent level by one which is even nicer.

f32dfcc4

by Ansgar at 2020-12-29T23:52:56+01:00

clean: do not commit to database after each file removal

The code handles database entries referring to non-existing file.  If
an unexpected error occurs and the database transactions gets rolled
back then the file entries will just be dropped from the database in
the next run.

1 changed file:

dak/clean_suites.py

Changes:

dak/clean_suites.py

@@ -286,37 +286,36 @@ def clean(now_date, archives, max_delete, session):
      for af in old_files:
          filename = af.path
 -        if not os.path.exists(filename):
 -            Logger.log(["database referred to non-existing file", af.path])
 +        try:
 +            st = os.lstat(filename)
 +        except FileNotFoundError:
 +            Logger.log(["database referred to non-existing file", filename])
              session.delete(af)
              continue
          Logger.log(["delete archive file", filename])
 -        if os.path.isfile(filename):
 -            if os.path.islink(filename):
 -                count += 1
 -                Logger.log(["delete symlink", filename])
 -                if not Options["No-Action"]:
 -                    os.unlink(filename)
 -            else:
 -                size += os.stat(filename)[stat.ST_SIZE]
 -                count += 1
+-
 -                dest_filename = dest + '/' + os.path.basename(filename)
 -                # If the destination file exists; try to find another filename to use
 -                if os.path.lexists(dest_filename):
 -                    dest_filename = utils.find_next_free(dest_filename)
 +        if stat.S_ISLNK(st.st_mode):
 +            count += 1
 +            Logger.log(["delete symlink", filename])
 +            if not Options["No-Action"]:
 +                os.unlink(filename)
 +                session.delete(af)
 +        elif stat.S_ISREG(st.st_mode):
 +            size += st.st_size
 +            count += 1
 -                if not Options["No-Action"]:
 -                    if af.archive.use_morgue:
 -                        Logger.log(["move to morgue", filename, dest_filename])
 -                        utils.move(filename, dest_filename)
 -                    else:
 -                        Logger.log(["removed file", filename])
 -                        os.unlink(filename)
 +            dest_filename = dest + '/' + os.path.basename(filename)
 +            # If the destination file exists; try to find another filename to use
 +            if os.path.lexists(dest_filename):
 +                dest_filename = utils.find_next_free(dest_filename)
              if not Options["No-Action"]:
 +                if af.archive.use_morgue:
 +                    Logger.log(["move to morgue", filename, dest_filename])
 +                    utils.move(filename, dest_filename)
 +                else:
 +                    Logger.log(["removed file", filename])
 +                    os.unlink(filename)
                  session.delete(af)
 -                session.commit()
          else:
              utils.fubar("%s is neither symlink nor file?!" % (filename))