Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
喜羊羊3508
Dak
提交
ba454dcf
D
Dak
项目概览
喜羊羊3508
/
Dak
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
Dak
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
ba454dcf
编写于
9月 23, 2017
作者:
A
Ansgar Burchardt
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
silence SQLAlchemy warning about textual SQL expressions
上级
fd4c7d86
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
8 addition
and
6 deletion
+8
-6
dak/manage_build_queues.py
dak/manage_build_queues.py
+5
-4
dak/update_suite.py
dak/update_suite.py
+3
-2
未找到文件。
dak/manage_build_queues.py
浏览文件 @
ba454dcf
...
...
@@ -28,6 +28,7 @@
import
apt_pkg
from
datetime
import
datetime
,
timedelta
import
sys
import
sqlalchemy.sql
as
sql
from
daklib
import
daklog
from
daklib.archive
import
ArchiveTransaction
...
...
@@ -65,7 +66,7 @@ def clean(build_queue, transaction, now=None):
# 1. Keep binaries that are in policy queues.
# 2. Remove binaries that are not in suites.
# 3. Remove binaries that have been in the build queue for some time.
query
=
"""
query
=
sql
.
text
(
"""
SELECT b.*
FROM binaries b
JOIN bin_associations ba ON b.id = ba.bin
...
...
@@ -82,7 +83,7 @@ def clean(build_queue, transaction, now=None):
OR NOT EXISTS
(SELECT 1 FROM bin_associations ba2
JOIN suite_build_queue_copy sbqc ON sbqc.suite = ba2.suite
WHERE ba2.bin = ba.bin AND sbqc.build_queue_id = :build_queue_id))"""
WHERE ba2.bin = ba.bin AND sbqc.build_queue_id = :build_queue_id))"""
)
binaries
=
session
.
query
(
DBBinary
).
from_statement
(
query
)
\
.
params
({
'build_queue_id'
:
build_queue
.
queue_id
,
'suite_id'
:
suite
.
suite_id
,
'delete_before'
:
delete_before
})
for
binary
in
binaries
:
...
...
@@ -92,7 +93,7 @@ def clean(build_queue, transaction, now=None):
# Remove sources
# Conditions are similar as for binaries, but we also keep sources
# if there is a binary in the build queue that uses it.
query
=
"""
query
=
sql
.
text
(
"""
SELECT s.*
FROM source s
JOIN src_associations sa ON s.id = sa.source
...
...
@@ -114,7 +115,7 @@ def clean(build_queue, transaction, now=None):
(SELECT 1 FROM bin_associations ba
JOIN binaries b ON ba.bin = b.id
WHERE ba.suite = :suite_id
AND b.source = s.id)"""
AND b.source = s.id)"""
)
sources
=
session
.
query
(
DBSource
).
from_statement
(
query
)
\
.
params
({
'build_queue_id'
:
build_queue
.
queue_id
,
'suite_id'
:
suite
.
suite_id
,
'delete_before'
:
delete_before
})
for
source
in
sources
:
...
...
dak/update_suite.py
浏览文件 @
ba454dcf
...
...
@@ -22,6 +22,7 @@ import daklib.daklog
import
daklib.utils
from
sqlalchemy.orm.exc
import
NoResultFound
import
sqlalchemy.sql
as
sql
import
sys
"""
...
...
@@ -134,7 +135,7 @@ class SuiteUpdater(object):
'additional_sources'
:
additional_sources
,
}
return
self
.
transaction
.
session
.
query
(
DBBinary
).
from_statement
(
query
).
params
(
params
)
return
self
.
transaction
.
session
.
query
(
DBBinary
).
from_statement
(
sql
.
text
(
query
)
).
params
(
params
)
def
query_new_sources
(
self
):
# Candidates are source packages in the origin suite, and optionally in its policy queue.
...
...
@@ -177,7 +178,7 @@ class SuiteUpdater(object):
params
=
{
'origin'
:
self
.
origin
.
suite_id
,
'target'
:
self
.
target
.
suite_id
}
return
self
.
transaction
.
session
.
query
(
DBSource
).
from_statement
(
query
).
params
(
params
)
return
self
.
transaction
.
session
.
query
(
DBSource
).
from_statement
(
sql
.
text
(
query
)
).
params
(
params
)
def
_components_for_binary
(
self
,
binary
,
suite
):
session
=
self
.
transaction
.
session
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录