X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=a34e5c75e8ebb57a01e18fbf55c74088741d22d0;hb=fa35358d461b03ff5833385ca2970cecce454d0e;hp=13d324ca30b6fcbc07a74b7239159ca1c9f0d639;hpb=523fe5c7bf7c34bba8aa1125076efcd8fcca7063;p=dak.git

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 13d324ca..a34e5c75 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -37,6 +37,7 @@ import os
 import re
 import psycopg2
 import traceback
+import commands
 from datetime import datetime, timedelta
 from errno import ENOENT
 from tempfile import mkstemp, mkdtemp
@@ -441,8 +442,8 @@ MINIMAL_APT_CONF="""
 Dir
 {
    ArchiveDir "%(archivepath)s";
-   OverrideDir "/srv/ftp-master.debian.org/scripts/override/";
-   CacheDir "/srv/ftp-master.debian.org/database/";
+   OverrideDir "/srv/backports-master.debian.org/scripts/override/";
+   CacheDir "/srv/backports-master.debian.org/database/";
 };
 
 Default
@@ -2458,7 +2459,6 @@ SUITE_FIELDS = [ ('SuiteName', 'suite_name'),
                  ('OverrideSuite', 'overridesuite'),
                  ('ChangelogBase', 'changelogbase')]
 
-
 class Suite(object):
     def __init__(self, *args, **kwargs):
         pass
@@ -2487,9 +2487,6 @@ class Suite(object):
 
         return "\n".join(ret)
 
-    def generate_packages_sources(self, Logger):
-        """ Generate Packages/Sources files for the given suite"
-
 __all__.append('Suite')
 
 @session_wrapper
@@ -2658,28 +2655,6 @@ class Uid(object):
 
 __all__.append('Uid')
 
-@session_wrapper
-def add_database_user(uidname, session=None):
-    """
-    Adds a database user
-
-    @type uidname: string
-    @param uidname: The uid of the user to add
-
-    @type session: SQLAlchemy
-    @param session: Optional SQL session object (a temporary one will be
-    generated if not supplied).  If not passed, a commit will be performed at
-    the end of the function, otherwise the caller is responsible for commiting.
-
-    @rtype: Uid
-    @return: the uid object for the given uidname
-    """
-
-    session.execute("CREATE USER :uid", {'uid': uidname})
-    session.commit_or_flush()
-
-__all__.append('add_database_user')
-
 @session_wrapper
 def get_or_set_uid(uidname, session=None):
     """