From: Mike O'Connor <stew@vireo.org>
Date: Tue, 5 Jan 2010 20:26:18 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into contents
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=54a1e63df2a81a8f5e6f3148d59afcfeaa7b3495;p=dak.git

Merge remote branch 'origin/master' into contents

* origin/master: (35 commits)
  Fix indentation
  policy-queue
  dinstall
  No longer update a tracefile hourly. Instead update our tracefile the second before we create the mirror hardlinks
  docstrings
  Describe what debversion is doing
  Adjust filename passed to get_poolfile_like_name
  drop unused function, fix a docstring
  docstrings
  Add a few docstrings. If someone could complete that, it would be great
  queue, check_source
  queue
  daklib/queue
  generate-filelist: add irc quote
  generate-filelist: improve arch all handling
  generate-filelist: improve formatting of help
  why, oh why, doesnt this fix itself when its wrong?
  meh
  common
  multiple
  ...
---

54a1e63df2a81a8f5e6f3148d59afcfeaa7b3495
diff --cc daklib/dbconn.py
index 0fe48f10,46956778..88e954fe
mode 100644,100755..100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py