From: Ansgar Burchardt Date: Mon, 21 May 2012 22:12:11 +0000 (+0200) Subject: Remove split-done. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb709de9e377628445e0fd892c121c10ad34a5a9;p=dak Remove split-done. Since 0ce7303ebc8d854fa8061669d39aba933665af6c we store changes files directly into date-based directories. --- diff --git a/config/backports/cron.weekly b/config/backports/cron.weekly index 097aa63c..1929e10f 100755 --- a/config/backports/cron.weekly +++ b/config/backports/cron.weekly @@ -29,11 +29,6 @@ if [ ! -z "$(find $ftpdir/pool/ -type d -empty)" ]; then find $ftpdir/pool/ -type d -empty | xargs rmdir; fi -# Clean up apt-ftparchive's databases - -echo "Splitting queue/done" -dak split-done - # Clean up apt-ftparchive's databases cd $configdir #echo "Cleanup apt-ftparchive's database" diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly index 06d3f90a..b75539ed 100755 --- a/config/debian/cron.weekly +++ b/config/debian/cron.weekly @@ -31,10 +31,6 @@ if [ ! -z "$(find $ftpdir/pool/ -type d -empty)" ]; then find $ftpdir/pool/ -type d -empty | xargs rmdir; fi -# Split queue/done -echo "Splitting queue/done" -dak split-done > /dev/null - # Do git cleanup stuff echo "Doing git stuff" cd /srv/ftp.debian.org/git/dak.git diff --git a/dak/dak.py b/dak/dak.py index 1e36d82d..b6e77ad4 100755 --- a/dak/dak.py +++ b/dak/dak.py @@ -131,8 +131,6 @@ def init(): "Generates override files"), ("new-security-install", "New way to install a security upload into the archive"), - ("split-done", - "Split queue/done into a date-based hierarchy"), ("stats", "Generate statistics"), ("bts-categorize", diff --git a/dak/split_done.py b/dak/split_done.py deleted file mode 100755 index 3d072872..00000000 --- a/dak/split_done.py +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env python - -""" Split queue/done into date based subdirectories """ -# Copyright (C) 2004, 2005, 2006 James Troup -# Copyright (C) 2008 Joerg Jaspert - -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -################################################################################ - -import glob, os, stat, time -from daklib import utils - -################################################################################ - -def main(): - Cnf = utils.get_conf() - count = 0 - move_date = int(time.time()) - os.chdir(Cnf["Dir::Done"]) - files = glob.glob("%s/*" % (Cnf["Dir::Done"])) - for filename in files: - if os.path.isfile(filename): - filemtime = os.stat(filename)[stat.ST_MTIME] - if filemtime > move_date: - continue - mtime = time.gmtime(filemtime) - dirname = time.strftime("%Y/%m/%d", mtime) - if not os.path.exists(dirname): - print "Creating: %s" % (dirname) - os.makedirs(dirname) - dest = dirname + '/' + os.path.basename(filename) - if os.path.exists(dest): - utils.warn("%s already exists." % (dest)) - continue - print "Move: %s -> %s" % (filename, dest) - os.rename(filename, dest) - count = count + 1 - print "Moved %d files." % (count) - -############################################################ - -if __name__ == '__main__': - main()