Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
喜羊羊3508
Dak
提交
73cf2cb7
D
Dak
项目概览
喜羊羊3508
/
Dak
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
73cf2cb7
编写于
7月 27, 2011
作者:
M
Mark Hymers
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Centralise UrgencyLog handling
Signed-off-by:
N
Mark Hymers
<
mhy@debian.org
>
上级
70f6c4de
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
31 addition
and
16 deletion
+31
-16
dak/process_upload.py
dak/process_upload.py
+5
-7
daklib/queue.py
daklib/queue.py
+1
-1
daklib/urgencylog.py
daklib/urgencylog.py
+25
-8
未找到文件。
dak/process_upload.py
浏览文件 @
73cf2cb7
...
...
@@ -424,7 +424,6 @@ def main():
cnf
=
Config
()
summarystats
=
SummaryStats
()
log_urgency
=
False
DBConn
()
...
...
@@ -464,10 +463,10 @@ def main():
utils
.
fubar
(
"Couldn't obtain lock; assuming another 'dak process-upload' is already running."
)
else
:
raise
if
cnf
.
get
(
"Dir::UrgencyLog"
):
# Initialise UrgencyLog()
log_urgency
=
True
UrgencyLog
()
# Initialise UrgencyLog() - it will deal with the case where we don't
# want to log urgencies
urgencylog
=
UrgencyLog
()
Logger
=
daklog
.
Logger
(
"process-upload"
,
Options
[
"No-Action"
])
...
...
@@ -513,8 +512,7 @@ def main():
byebye
()
if
not
Options
[
"No-Action"
]:
if
log_urgency
:
UrgencyLog
().
close
()
urgencylog
.
close
()
Logger
.
close
()
...
...
daklib/queue.py
浏览文件 @
73cf2cb7
...
...
@@ -2181,7 +2181,7 @@ distribution."""
utils
.
move
(
self
.
pkg
.
changes_file
,
os
.
path
.
join
(
donedir
,
os
.
path
.
basename
(
self
.
pkg
.
changes_file
)))
if
self
.
pkg
.
changes
[
"architecture"
].
has_key
(
"source"
)
and
cnf
.
get
(
"Dir::UrgencyLog"
)
:
if
self
.
pkg
.
changes
[
"architecture"
].
has_key
(
"source"
):
UrgencyLog
().
log
(
self
.
pkg
.
dsc
[
"source"
],
self
.
pkg
.
dsc
[
"version"
],
self
.
pkg
.
changes
[
"urgency"
])
self
.
update_subst
()
...
...
daklib/urgencylog.py
浏览文件 @
73cf2cb7
...
...
@@ -47,26 +47,43 @@ class UrgencyLog(object):
self
.
timestamp
=
time
.
strftime
(
"%Y%m%d%H%M%S"
)
# Create the log directory if it doesn't exist
self
.
log_dir
=
Config
()[
"Dir::UrgencyLog"
]
cnf
=
Config
()
if
cnf
.
has_key
(
"Dir::UrgencyLog"
):
# Create the log directory if it doesn't exist
self
.
log_dir
=
cnf
[
"Dir::UrgencyLog"
]
if
not
os
.
path
.
exists
(
self
.
log_dir
)
or
not
os
.
access
(
self
.
log_dir
,
os
.
W_OK
):
warn
(
"UrgencyLog directory %s does not exist or is not writeable, using /srv/ftp.debian.org/tmp/ instead"
%
(
self
.
log_dir
))
self
.
log_dir
=
'/srv/ftp.debian.org/tmp/'
if
not
os
.
path
.
exists
(
self
.
log_dir
)
or
not
os
.
access
(
self
.
log_dir
,
os
.
W_OK
):
warn
(
"UrgencyLog directory %s does not exist or is not writeable, using /srv/ftp.debian.org/tmp/ instead"
%
(
self
.
log_dir
))
self
.
log_dir
=
'/srv/ftp.debian.org/tmp/'
# Open the logfile
self
.
log_filename
=
"%s/.install-urgencies-%s.new"
%
(
self
.
log_dir
,
self
.
timestamp
)
self
.
log_file
=
open_file
(
self
.
log_filename
,
'w'
)
else
:
self
.
log_dir
=
None
self
.
log_filename
=
None
self
.
log_file
=
None
# Open the logfile
self
.
log_filename
=
"%s/.install-urgencies-%s.new"
%
(
self
.
log_dir
,
self
.
timestamp
)
self
.
log_file
=
open_file
(
self
.
log_filename
,
'w'
)
self
.
writes
=
0
def
log
(
self
,
source
,
version
,
urgency
):
"Log an event"
# Don't try and log if Dir::UrgencyLog is not configured
if
self
.
log_file
is
None
:
return
self
.
log_file
.
write
(
" "
.
join
([
source
,
version
,
urgency
])
+
'
\n
'
)
self
.
log_file
.
flush
()
self
.
writes
+=
1
def
close
(
self
):
"Close a Logger object"
# Don't try and log if Dir::UrgencyLog is not configured
if
self
.
log_file
is
None
:
return
self
.
log_file
.
flush
()
self
.
log_file
.
close
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录