X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=559dbf17a98340169319bc06dddbf3e1d32dae0b;hb=6be5aed8f454679a634d194d0dc41d5dc9e5cb22;hp=5f45cdfc9f8ee1763ef3ab2f3c40337c36d4a577;hpb=738799f8a7992d38ee6e8fe7eb8dd5f22285c732;p=dak.git diff --git a/daklib/dbconn.py b/daklib/dbconn.py index 5f45cdfc..559dbf17 100755 --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -441,8 +441,8 @@ MINIMAL_APT_CONF=""" Dir { ArchiveDir "%(archivepath)s"; - OverrideDir "/srv/ftp.debian.org/scripts/override/"; - CacheDir "/srv/ftp.debian.org/database/"; + OverrideDir "/srv/ftp-master.debian.org/scripts/override/"; + CacheDir "/srv/ftp-master.debian.org/database/"; }; Default @@ -1511,7 +1511,7 @@ def get_location(location, component=None, archive=None, session=None): and archive @type location: string - @param location: the path of the location, e.g. I{/srv/ftp.debian.org/ftp/pool/} + @param location: the path of the location, e.g. I{/srv/ftp-master.debian.org/ftp/pool/} @type component: string @param component: the component name (if None, no restriction applied) @@ -2305,7 +2305,7 @@ def add_dsc_to_db(u, filename, session=None): # Add the src_uploaders to the DB uploader_ids = [source.maintainer_id] if u.pkg.dsc.has_key("uploaders"): - for up in u.pkg.dsc["uploaders"].replace(">, ", "\t")split("\t"): + for up in u.pkg.dsc["uploaders"].replace(">, ", ">\t").split("\t"): up = up.strip() uploader_ids.append(get_or_set_maintainer(up, session).maintainer_id)