X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Farchive.py;h=6d3d334e8f1cf981a0b1997a39194db1c1057374;hb=362ea497d3c9ee5891fca772132269d809a0547a;hp=e2b3a17a5ccf10c6e69d1492d760c6480dab1976;hpb=e6b1c633b7127f1d2ef938b7ea2181ce9e184906;p=dak.git diff --git a/daklib/archive.py b/daklib/archive.py index e2b3a17a..6d3d334e 100644 --- a/daklib/archive.py +++ b/daklib/archive.py @@ -636,8 +636,9 @@ class ArchiveUpload(object): cnf = Config() session = self.transaction.session + group = cnf.get('Dinstall::UnprivGroup') or None self.directory = utils.temp_dirname(parent=cnf.get('Dir::TempPath'), - mode=0o2750, group=cnf.unprivgroup) + mode=0o2750, group=group) with FilesystemTransaction() as fs: src = os.path.join(self.original_directory, self.original_changes.filename) dst = os.path.join(self.directory, self.original_changes.filename) @@ -667,7 +668,7 @@ class ArchiveUpload(object): try: db_file = self.transaction.get_file(f, source.dsc['Source'], check_hashes=False) db_archive_file = session.query(ArchiveFile).filter_by(file=db_file).first() - fs.copy(db_archive_file.path, dst, symlink=True) + fs.copy(db_archive_file.path, dst, mode=0o640) except KeyError: # Ignore if get_file could not find it. Upload will # probably be rejected later.