Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
喜羊羊3508
Dak
提交
2d252212
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,发现更多精彩内容 >>
提交
2d252212
编写于
5月 10, 2002
作者:
J
James Troup
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix changes_compare to sort right. Add validate_changes_file_arg
上级
e90db46e
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
37 addition
and
16 deletion
+37
-16
utils.py
utils.py
+37
-16
未找到文件。
utils.py
浏览文件 @
2d252212
# Utility functions
# Utility functions
# Copyright (C) 2000, 2001, 2002 James Troup <james@nocrew.org>
# Copyright (C) 2000, 2001, 2002 James Troup <james@nocrew.org>
# $Id: utils.py,v 1.4
2 2002-05-08 11:13:4
4 troup Exp $
# $Id: utils.py,v 1.4
3 2002-05-10 00:24:1
4 troup Exp $
# This program is free software; you can redistribute it and/or modify
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# it under the terms of the GNU General Public License as published by
...
@@ -379,7 +379,7 @@ def regex_safe (s):
...
@@ -379,7 +379,7 @@ def regex_safe (s):
######################################################################################
######################################################################################
# Perform a substition of template
# Perform a substition of template
def
TemplateSubst
(
map
,
filename
):
def
TemplateSubst
(
map
,
filename
):
file
=
open_file
(
filename
);
file
=
open_file
(
filename
);
template
=
file
.
read
();
template
=
file
.
read
();
for
x
in
map
.
keys
():
for
x
in
map
.
keys
():
...
@@ -425,8 +425,7 @@ def cc_fix_changes (changes):
...
@@ -425,8 +425,7 @@ def cc_fix_changes (changes):
for
j
in
string
.
split
(
o
):
for
j
in
string
.
split
(
o
):
changes
[
"architecture"
][
j
]
=
1
changes
[
"architecture"
][
j
]
=
1
# Sort by 'have source', by source name, by source version number, by filename
# Sort by source name, source version, 'have source', and then by filename
def
changes_compare
(
a
,
b
):
def
changes_compare
(
a
,
b
):
try
:
try
:
a_changes
=
parse_changes
(
a
,
0
)
a_changes
=
parse_changes
(
a
,
0
)
...
@@ -441,17 +440,7 @@ def changes_compare (a, b):
...
@@ -441,17 +440,7 @@ def changes_compare (a, b):
cc_fix_changes
(
a_changes
);
cc_fix_changes
(
a_changes
);
cc_fix_changes
(
b_changes
);
cc_fix_changes
(
b_changes
);
# Sort by 'have source'
a_has_source
=
a_changes
[
"architecture"
].
get
(
"source"
)
b_has_source
=
b_changes
[
"architecture"
].
get
(
"source"
)
if
a_has_source
and
not
b_has_source
:
return
-
1
;
elif
b_has_source
and
not
a_has_source
:
return
1
;
# Sort by source name
# Sort by source name
a_source
=
a_changes
.
get
(
"source"
);
a_source
=
a_changes
.
get
(
"source"
);
b_source
=
b_changes
.
get
(
"source"
);
b_source
=
b_changes
.
get
(
"source"
);
q
=
cmp
(
a_source
,
b_source
);
q
=
cmp
(
a_source
,
b_source
);
...
@@ -459,15 +448,21 @@ def changes_compare (a, b):
...
@@ -459,15 +448,21 @@ def changes_compare (a, b):
return
q
;
return
q
;
# Sort by source version
# Sort by source version
a_version
=
a_changes
.
get
(
"version"
);
a_version
=
a_changes
.
get
(
"version"
);
b_version
=
b_changes
.
get
(
"version"
);
b_version
=
b_changes
.
get
(
"version"
);
q
=
apt_pkg
.
VersionCompare
(
a_version
,
b_version
);
q
=
apt_pkg
.
VersionCompare
(
a_version
,
b_version
);
if
q
:
if
q
:
return
q
return
q
# Fall back to sort by filename
# Sort by 'have source'
a_has_source
=
a_changes
[
"architecture"
].
get
(
"source"
)
b_has_source
=
b_changes
[
"architecture"
].
get
(
"source"
)
if
a_has_source
and
not
b_has_source
:
return
-
1
;
elif
b_has_source
and
not
a_has_source
:
return
1
;
# Fall back to sort by filename
return
cmp
(
a
,
b
);
return
cmp
(
a
,
b
);
################################################################################
################################################################################
...
@@ -508,6 +503,32 @@ def prefix_multi_line_string(str, prefix):
...
@@ -508,6 +503,32 @@ def prefix_multi_line_string(str, prefix):
################################################################################
################################################################################
def
validate_changes_file_arg
(
file
,
fatal
=
1
):
error
=
None
;
if
file
[
-
6
:]
==
".katie"
:
file
=
file
[:
-
6
]
+
".changes"
;
if
file
[
-
8
:]
!=
".changes"
:
error
=
"invalid file type; not a changes file"
;
else
:
if
not
os
.
access
(
file
,
os
.
R_OK
):
if
os
.
path
.
exists
(
file
):
error
=
"permission denied"
;
else
:
error
=
"file not found"
;
if
error
:
if
fatal
:
fubar
(
"%s: %s."
%
(
file
,
error
));
else
:
warn
(
"Skipping %s - %s"
%
(
file
,
error
));
return
None
;
else
:
return
file
;
################################################################################
def
get_conf
():
def
get_conf
():
return
Cnf
;
return
Cnf
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录