Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
喜羊羊3508
Dak
提交
b96fec59
D
Dak
项目概览
喜羊羊3508
/
Dak
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
b96fec59
编写于
10月 31, 2009
作者:
M
Mark Hymers
浏览文件
操作
浏览文件
下载
差异文件
Merge commit 'djpig/process-upload'
上级
8fbdf337
e1bb1650
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
14 addition
and
12 deletion
+14
-12
dak/dakdb/update22.py
dak/dakdb/update22.py
+1
-1
dak/process_upload.py
dak/process_upload.py
+3
-3
daklib/changes.py
daklib/changes.py
+1
-1
daklib/dbconn.py
daklib/dbconn.py
+1
-1
daklib/queue.py
daklib/queue.py
+6
-4
daklib/queue_install.py
daklib/queue_install.py
+2
-2
未找到文件。
dak/dakdb/update22.py
浏览文件 @
b96fec59
...
...
@@ -98,7 +98,7 @@ def do_update(self):
ON DELETE CASCADE"""
)
c
.
execute
(
"""ALTER TABLE suite DROP CONSTRAINT suite_policy_queue_fkey"""
)
c
.
execute
(
"""ALTER TABLE suite DROP CONSTRAINT suite_policy_queue_
id_
fkey"""
)
c
.
execute
(
"""UPDATE suite
SET policy_queue_id = (SELECT policy_queue.id FROM policy_queue
...
...
dak/process_upload.py
浏览文件 @
b96fec59
...
...
@@ -196,7 +196,7 @@ def usage (exit_code=0):
###############################################################################
def
action
(
u
,
dbc
):
def
action
(
u
):
cnf
=
Config
()
holding
=
Holding
()
session
=
DBConn
().
session
()
...
...
@@ -257,12 +257,12 @@ def action(u, dbc):
# so, we skip the policy queue, otherwise we go there.
divert
=
package_to_suite
(
u
,
suite
.
suite_name
,
session
=
session
)
if
divert
:
print
"%s for %s
\n
%s%s"
%
(
su
.
policy_queue
.
queue_name
.
upper
(),
print
"%s for %s
\n
%s%s"
%
(
su
ite
.
policy_queue
.
queue_name
.
upper
(),
", "
.
join
(
u
.
pkg
.
changes
[
"distribution"
].
keys
()),
pi
,
summary
)
queuekey
=
"P"
prompt
=
"[P]olicy, Skip, Quit ?"
policyqueue
=
su
.
policy_queue
policyqueue
=
su
ite
.
policy_queue
if
Options
[
"Automatic"
]:
answer
=
'P'
break
...
...
daklib/changes.py
浏览文件 @
b96fec59
...
...
@@ -205,7 +205,7 @@ class Changes(object):
multivalues
[
key
]
=
self
.
changes
[
key
].
keys
()
session
.
execute
(
"""INSERT INTO
known_
changes
"""INSERT INTO changes
(changesname, seen, source, binaries, architecture, version,
distribution, urgency, maintainer, fingerprint, changedby, date)
VALUES (:changesfile,:filetime,:source,:binary, :architecture,
...
...
daklib/dbconn.py
浏览文件 @
b96fec59
...
...
@@ -2088,7 +2088,7 @@ def add_deb_to_db(u, filename, session=None):
filename
=
entry
[
"pool name"
]
+
filename
fullpath
=
os
.
path
.
join
(
cnf
[
"Dir::Pool"
],
filename
)
if
not
entry
.
get
(
"location id"
,
None
):
entry
[
"location id"
]
=
get_location
(
cnf
[
"Dir::Pool"
],
entry
[
"component"
],
utils
.
where_am_i
(),
session
).
location_id
entry
[
"location id"
]
=
get_location
(
cnf
[
"Dir::Pool"
],
entry
[
"component"
],
session
=
session
).
location_id
if
not
entry
.
get
(
"files id"
,
None
):
poolfile
=
add_poolfile
(
filename
,
entry
,
entry
[
"location id"
],
session
)
...
...
daklib/queue.py
浏览文件 @
b96fec59
...
...
@@ -720,7 +720,6 @@ class Upload(object):
def
per_suite_file_checks
(
self
,
f
,
suite
,
session
):
cnf
=
Config
()
entry
=
self
.
pkg
.
files
[
f
]
archive
=
utils
.
where_am_i
()
# Skip byhand
if
entry
.
has_key
(
"byhand"
):
...
...
@@ -764,9 +763,9 @@ class Upload(object):
# Determine the location
location
=
cnf
[
"Dir::Pool"
]
l
=
get_location
(
location
,
entry
[
"component"
],
archive
,
session
)
l
=
get_location
(
location
,
entry
[
"component"
],
session
=
session
)
if
l
is
None
:
self
.
rejects
.
append
(
"[INTERNAL ERROR] couldn't determine location (Component: %
s, Archive: %s)"
%
(
entry
[
"component"
],
archive
)
)
self
.
rejects
.
append
(
"[INTERNAL ERROR] couldn't determine location (Component: %
)"
%
entry
[
"component"
]
)
entry
[
"location id"
]
=
-
1
else
:
entry
[
"location id"
]
=
l
.
location_id
...
...
@@ -817,7 +816,10 @@ class Upload(object):
try
:
dbc
=
session
.
query
(
DBChange
).
filter_by
(
changesname
=
base_filename
).
one
()
if
dbc
.
in_queue
is
not
None
and
dbc
.
in_queue
.
queue_name
!=
'unchecked'
:
# if in the pool or in a queue other than unchecked, reject
if
(
dbc
.
in_queue
is
None
)
\
or
(
dbc
.
in_queue
is
not
None
and
dbc
.
in_queue
.
queue_name
!=
'unchecked'
):
self
.
rejects
.
append
(
"%s file already known to dak"
%
base_filename
)
except
NoResultFound
,
e
:
# not known, good
...
...
daklib/queue_install.py
浏览文件 @
b96fec59
...
...
@@ -34,14 +34,14 @@ from daklib.config import Config
################################################################################
def
package_to_suite
(
u
,
suite_name
,
session
):
if
not
u
.
pkg
.
changes
[
"distribution"
].
has_key
(
suite
):
if
not
u
.
pkg
.
changes
[
"distribution"
].
has_key
(
suite
_name
):
return
False
ret
=
True
if
not
u
.
pkg
.
changes
[
"architecture"
].
has_key
(
"source"
):
q
=
session
.
query
(
SrcAssociation
.
sa_id
)
q
=
q
.
join
(
Suite
).
filter_by
(
suite_name
=
suite
)
q
=
q
.
join
(
Suite
).
filter_by
(
suite_name
=
suite
_name
)
q
=
q
.
join
(
DBSource
).
filter_by
(
source
=
u
.
pkg
.
changes
[
'source'
])
q
=
q
.
filter_by
(
version
=
u
.
pkg
.
changes
[
'version'
]).
limit
(
1
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录