sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.server] fix a bunch of regressions caused by previously committed huge code move

Browse Source
This commit is contained in:
Fabio Erculiani
2010-01-27 19:22:46 +01:00
parent f1517bd880
commit 6afdcd2bb2
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/entropy/server/interfaces/mirrors.py
View File

@@ -2552,7 +2552,7 @@ class Server(ServerNoticeBoardMixin):
repo = repo)
db_files = dbconn.listAllDownloads(do_sort = False,
full_path = True)
db_files = set([os.path.basename(x) for x in db_files if \
db_files = set([x for x in db_files if \
(self.Entropy.get_branch_from_download_relative_uri(x) == branch)])
exclude = set()
@@ -2744,9 +2744,8 @@ class Server(ServerNoticeBoardMixin):
m_broken_uris = set()
for rel_path, myqueue in queue_map.items():
remote_dir = os.path.dirname(
self.Entropy.complete_remote_package_relative_path(
rel_path, repo = repo))
remote_dir = self.Entropy.complete_remote_package_relative_path(
rel_path, repo = repo)
uploader = self.TransceiverServerHandler(self.Entropy, [uri],
myqueue, critical_files = myqueue,
@@ -2814,9 +2813,8 @@ class Server(ServerNoticeBoardMixin):
m_broken_uris = set()
for rel_path, myqueue in queue_map.items():
remote_dir = os.path.dirname(
self.Entropy.complete_remote_package_relative_path(
rel_path, repo = repo))
remote_dir = self.Entropy.complete_remote_package_relative_path(
rel_path, repo = repo)
local_basedir = os.path.dirname(
self.Entropy.complete_local_package_path(rel_path,

7
libraries/entropy/server/transceivers.py
View File

@@ -342,17 +342,12 @@ class TransceiverServerHandler:
header = blue(" @@ ")
)
branch = SystemSettings()['repositories']['branch']
my_path = os.path.join(
self.Entropy._get_remote_database_relative_path(self.repo),
branch)
self.Entropy.output(
"[%s|%s] %s %s..." % (
blue(crippled_uri),
brown(action),
blue(_("setting directory to")),
darkgreen(my_path),
darkgreen(self.txc_basedir),
),
importance = 0,
type = "info",