Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
喜羊羊3508
Dak
提交
f4a53b25
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,发现更多精彩内容 >>
提交
f4a53b25
编写于
11月 11, 2011
作者:
A
Ansgar Burchardt
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Adapt to changes to Package-List field.
上级
c409b272
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
13 addition
and
24 deletion
+13
-24
daklib/queue.py
daklib/queue.py
+3
-3
daklib/utils.py
daklib/utils.py
+10
-21
未找到文件。
daklib/queue.py
浏览文件 @
f4a53b25
...
...
@@ -51,7 +51,7 @@ from holding import Holding
from
urgencylog
import
UrgencyLog
from
dbconn
import
*
from
summarystats
import
SummaryStats
from
utils
import
parse_changes
,
check_dsc_files
,
build_package_
se
t
from
utils
import
parse_changes
,
check_dsc_files
,
build_package_
lis
t
from
textutils
import
fix_maintainer
from
lintian
import
parse_lintian_output
,
generate_reject_messages
from
contents
import
UnpackedSource
...
...
@@ -133,8 +133,8 @@ def determine_new(filename, changes, files, warn=1, session = None, dsc = None,
# Try to get the Package-Set field from an included .dsc file (if possible).
if
dsc
:
for
package
,
entry
in
build_package_
se
t
(
dsc
,
session
).
items
():
if
not
new
.
has_key
(
package
)
:
for
package
,
entry
in
build_package_
lis
t
(
dsc
,
session
).
items
():
if
package
not
in
new
:
new
[
package
]
=
entry
# Build up a list of potentially new things
...
...
daklib/utils.py
浏览文件 @
f4a53b25
...
...
@@ -577,39 +577,28 @@ def build_file_list(changes, is_a_dsc=0, field="files", hashname="md5sum"):
################################################################################
# see http://bugs.debian.org/619131
def
build_package_
se
t
(
dsc
,
session
=
None
):
if
not
dsc
.
has_key
(
"package-
se
t"
):
def
build_package_
lis
t
(
dsc
,
session
=
None
):
if
not
dsc
.
has_key
(
"package-
lis
t"
):
return
{}
packages
=
{}
for
line
in
dsc
[
"package-
se
t"
].
split
(
"
\n
"
):
for
line
in
dsc
[
"package-
lis
t"
].
split
(
"
\n
"
):
if
not
line
:
break
(
name
,
section
,
priority
)
=
line
.
split
()
(
section
,
component
)
=
extract_component_from_section
(
section
)
package_type
=
"deb"
if
name
.
find
(
":"
)
!=
-
1
:
(
package_type
,
name
)
=
name
.
split
(
":"
,
1
)
if
package_type
==
"src"
:
package_type
=
"dsc"
fields
=
line
.
split
()
name
=
fields
[
0
]
package_type
=
fields
[
1
]
(
section
,
component
)
=
extract_component_from_section
(
fields
[
2
])
priority
=
fields
[
3
]
# Validate type if we have a session
if
session
and
get_override_type
(
package_type
,
session
)
is
None
:
# Maybe just warn and ignore? exit(1) might be a bit hard...
utils
.
fubar
(
"invalid type (%s) in Package-Set."
%
(
package_type
))
if
section
==
""
:
section
=
"-"
if
priority
==
""
:
priority
=
"-"
if
package_type
==
"dsc"
:
priority
=
"source"
utils
.
fubar
(
"invalid type (%s) in Package-List."
%
(
package_type
))
if
n
ot
packages
.
has_key
(
name
)
or
packages
[
name
][
"type"
]
==
"dsc"
:
if
n
ame
not
in
packages
or
packages
[
name
][
"type"
]
==
"dsc"
:
packages
[
name
]
=
dict
(
priority
=
priority
,
section
=
section
,
type
=
package_type
,
component
=
component
,
files
=
[])
return
packages
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录