... |
... |
@@ -24,7 +24,7 @@ import daklib.checks as checks |
24
|
24
|
from daklib.config import Config
|
25
|
25
|
from daklib.externalsignature import check_upload_for_external_signature_request
|
26
|
26
|
import daklib.upload as upload
|
27
|
|
-import daklib.utils as utils
|
|
27
|
+import daklib.utils
|
28
|
28
|
from daklib.fstransactions import FilesystemTransaction
|
29
|
29
|
from daklib.regexes import re_changelog_versions, re_bin_only_nmu
|
30
|
30
|
|
... |
... |
@@ -72,7 +72,7 @@ class ArchiveTransaction(object): |
72
|
72
|
@rtype: L{daklib.dbconn.PoolFile}
|
73
|
73
|
@return: database entry for the file
|
74
|
74
|
"""
|
75
|
|
- poolname = os.path.join(utils.poolify(source_name), hashed_file.filename)
|
|
75
|
+ poolname = os.path.join(daklib.utils.poolify(source_name), hashed_file.filename)
|
76
|
76
|
try:
|
77
|
77
|
poolfile = self.session.query(PoolFile).filter_by(filename=poolname).one()
|
78
|
78
|
if check_hashes and (poolfile.filesize != hashed_file.size
|
... |
... |
@@ -94,7 +94,7 @@ class ArchiveTransaction(object): |
94
|
94
|
"""
|
95
|
95
|
session = self.session
|
96
|
96
|
|
97
|
|
- poolname = os.path.join(utils.poolify(source_name), hashed_file.filename)
|
|
97
|
+ poolname = os.path.join(daklib.utils.poolify(source_name), hashed_file.filename)
|
98
|
98
|
try:
|
99
|
99
|
poolfile = self.get_file(hashed_file, source_name)
|
100
|
100
|
except KeyError:
|
... |
... |
@@ -683,8 +683,8 @@ class ArchiveUpload(object): |
683
|
683
|
session = self.transaction.session
|
684
|
684
|
|
685
|
685
|
group = cnf.get('Dinstall::UnprivGroup') or None
|
686
|
|
- self.directory = utils.temp_dirname(parent=cnf.get('Dir::TempPath'),
|
687
|
|
- mode=0o2750, group=group)
|
|
686
|
+ self.directory = daklib.utils.temp_dirname(parent=cnf.get('Dir::TempPath'),
|
|
687
|
+ mode=0o2750, group=group)
|
688
|
688
|
with FilesystemTransaction() as fs:
|
689
|
689
|
src = os.path.join(self.original_directory, self.original_changes.filename)
|
690
|
690
|
dst = os.path.join(self.directory, self.original_changes.filename)
|
... |
... |
@@ -820,7 +820,7 @@ class ArchiveUpload(object): |
820
|
820
|
# without a debug suite (which are then considered as NEW).
|
821
|
821
|
binaries = self.changes.binaries
|
822
|
822
|
for b in binaries:
|
823
|
|
- if utils.is_in_debug_section(b.control) and suite.debug_suite is not None:
|
|
823
|
+ if daklib.utils.is_in_debug_section(b.control) and suite.debug_suite is not None:
|
824
|
824
|
continue
|
825
|
825
|
override = self._binary_override(overridesuite, b)
|
826
|
826
|
if override is None:
|
... |
... |
@@ -1100,7 +1100,7 @@ class ArchiveUpload(object): |
1100
|
1100
|
db_binaries = []
|
1101
|
1101
|
for binary in sorted(self.changes.binaries, key=lambda x: x.name):
|
1102
|
1102
|
copy_to_suite = suite
|
1103
|
|
- if utils.is_in_debug_section(binary.control) and suite.debug_suite is not None:
|
|
1103
|
+ if daklib.utils.is_in_debug_section(binary.control) and suite.debug_suite is not None:
|
1104
|
1104
|
copy_to_suite = suite.debug_suite
|
1105
|
1105
|
|
1106
|
1106
|
component = binary_component_func(binary)
|