Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
喜羊羊3508
Dak
提交
a227189c
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,发现更多精彩内容 >>
提交
a227189c
编写于
11月 10, 2009
作者:
M
Mike O'Connor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
it at least gets to examine_package now
上级
648aa7bb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
27 deletion
+31
-27
dak/process_new.py
dak/process_new.py
+28
-24
daklib/queue.py
daklib/queue.py
+3
-3
未找到文件。
dak/process_new.py
浏览文件 @
a227189c
...
...
@@ -77,7 +77,7 @@ Sections = None
################################################################################
def
recheck
(
upload
,
session
):
upload
.
recheck
(
)
# STU: I'm not sure, but I don't thin kthis is necessary any longer: upload.recheck(session
)
if
len
(
upload
.
rejects
)
>
0
:
answer
=
"XXX"
if
Options
[
"No-Action"
]
or
Options
[
"Automatic"
]
or
Options
[
"Trainee"
]:
...
...
@@ -599,6 +599,7 @@ def prod_maintainer (note, upload):
def
do_new
(
upload
,
session
):
print
"NEW
\n
"
files
=
upload
.
pkg
.
files
upload
.
check_files
(
not
Options
[
"No-Action"
])
changes
=
upload
.
pkg
.
changes
cnf
=
Config
()
...
...
@@ -836,7 +837,7 @@ def move_file_to_queue(to_q, f, session=None):
@
session_wrapper
def
changes_to_unchecked
(
changes
,
session
=
None
):
"""move a changes file to unchecked"""
unchecked
=
get_
queue
(
'uncecked'
)
unchecked
=
get_
policy_queue
(
'unchecked'
,
session
);
changes
.
in_queue
=
unchecked
for
f
in
changes
.
files
:
...
...
@@ -868,9 +869,13 @@ def do_accept(upload):
_accept
(
upload
)
def
do_pkg
(
changes_file
,
session
):
new_queue
=
get_policy_queue
(
'new'
,
session
);
u
=
Upload
()
u
.
pkg
.
load_dot_dak
(
changes_file
)
u
.
update_subst
()
u
.
pkg
.
changes_file
=
changes_file
u
.
load_changes
(
changes_file
)
u
.
pkg
.
directory
=
new_queue
.
path
u
.
logger
=
Logger
origchanges
=
os
.
path
.
abspath
(
u
.
pkg
.
changes_file
)
cnf
=
Config
()
bcc
=
"X-DAK: dak process-new"
...
...
@@ -886,21 +891,23 @@ def do_pkg(changes_file, session):
if
not
recheck
(
u
,
session
):
return
(
new
,
byhand
)
=
check_status
(
files
)
if
new
or
byhand
:
if
new
:
do_new
(
u
,
session
)
if
byhand
:
do_byhand
(
u
,
session
)
(
new
,
byhand
)
=
check_status
(
files
)
if
not
new
and
not
byhand
:
try
:
check_daily_lock
()
do_accept
(
u
)
except
CantGetLockError
:
print
"Hello? Operator! Give me the number for 911!"
print
"Dinstall in the locked area, cant process packages, come back later"
do_new
(
u
,
session
)
# (new, byhand) = check_status(files)
# if new or byhand:
# if new:
# do_new(u, session)
# if byhand:
# do_byhand(u, session)
# (new, byhand) = check_status(files)
# if not new and not byhand:
# try:
# check_daily_lock()
# do_accept(u)
# except CantGetLockError:
# print "Hello? Operator! Give me the number for 911!"
# print "Dinstall in the locked area, cant process packages, come back later"
except
AlreadyLockedError
,
e
:
print
"Seems to be locked by %s already, skipping..."
%
(
e
)
...
...
@@ -925,10 +932,6 @@ def end():
def
main
():
global
Options
,
Logger
,
Sections
,
Priorities
print
"NO NEW PROCESSING CURRENTLY AVAILABLE"
print
"(Go and do something more interesting)"
sys
.
exit
(
0
)
cnf
=
Config
()
session
=
DBConn
().
session
()
...
...
@@ -944,7 +947,8 @@ def main():
changes_files
=
apt_pkg
.
ParseCommandLine
(
cnf
.
Cnf
,
Arguments
,
sys
.
argv
)
if
len
(
changes_files
)
==
0
:
changes_files
=
utils
.
get_changes_files
(
cnf
[
"Dir::Queue::New"
])
new_queue
=
get_policy_queue
(
'new'
,
session
);
changes_files
=
utils
.
get_changes_files
(
new_queue
.
path
)
Options
=
cnf
.
SubTree
(
"Process-New::Options"
)
...
...
daklib/queue.py
浏览文件 @
a227189c
...
...
@@ -115,8 +115,8 @@ def determine_new(changes, files, warn=1):
# Build up a list of potentially new things
for
name
,
f
in
files
.
items
():
# Skip byhand elements
if
f
[
"type"
]
==
"byhand"
:
continue
#
if f["type"] == "byhand":
#
continue
pkg
=
f
[
"package"
]
priority
=
f
[
"priority"
]
section
=
f
[
"section"
]
...
...
@@ -218,7 +218,7 @@ def check_valid(new):
def
check_status
(
files
):
new
=
byhand
=
0
for
f
in
files
.
keys
():
if
files
[
f
]
[
"type"
]
==
"byhand"
:
if
files
[
f
]
.
has_key
(
"byhand"
)
:
byhand
=
1
elif
files
[
f
].
has_key
(
"new"
):
new
=
1
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录