Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
喜羊羊3508
Dak
提交
7ae8ff59
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,发现更多精彩内容 >>
提交
7ae8ff59
编写于
9月 19, 2010
作者:
J
Joerg Jaspert
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Get rid of overridesuite and validtime in dak.conf
Signed-off-by:
N
Joerg Jaspert
<
joerg@debian.org
>
上级
05cf0237
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
27 deletion
+22
-27
config/debian/dak.conf
config/debian/dak.conf
+0
-10
dak/generate_releases.py
dak/generate_releases.py
+3
-3
daklib/queue.py
daklib/queue.py
+19
-14
未找到文件。
config/debian/dak.conf
浏览文件 @
7ae8ff59
...
@@ -205,8 +205,6 @@ Suite
...
@@ -205,8 +205,6 @@ Suite
contrib
;
contrib
;
non
-
free
;
non
-
free
;
};
};
OverrideSuite
"stable"
;
ValidTime
604800
; //
7
days
VersionChecks
VersionChecks
{
{
MustBeNewerThan
MustBeNewerThan
...
@@ -235,7 +233,6 @@ Suite
...
@@ -235,7 +233,6 @@ Suite
contrib
;
contrib
;
non
-
free
;
non
-
free
;
};
};
ValidTime
604800
; //
7
days
};
};
Testing
-
Proposed
-
Updates
Testing
-
Proposed
-
Updates
...
@@ -246,8 +243,6 @@ Suite
...
@@ -246,8 +243,6 @@ Suite
contrib
;
contrib
;
non
-
free
;
non
-
free
;
};
};
OverrideSuite
"testing"
;
ValidTime
604800
; //
7
days
VersionChecks
VersionChecks
{
{
MustBeNewerThan
MustBeNewerThan
...
@@ -277,8 +272,6 @@ Suite
...
@@ -277,8 +272,6 @@ Suite
contrib
;
contrib
;
non
-
free
;
non
-
free
;
};
};
OverrideSuite
"testing"
;
ValidTime
604800
; //
7
days
VersionChecks
VersionChecks
{
{
MustBeNewerThan
MustBeNewerThan
...
@@ -302,7 +295,6 @@ Suite
...
@@ -302,7 +295,6 @@ Suite
contrib
;
contrib
;
non
-
free
;
non
-
free
;
};
};
ValidTime
604800
; //
7
days
VersionChecks
VersionChecks
{
{
MustBeNewerThan
MustBeNewerThan
...
@@ -324,8 +316,6 @@ Suite
...
@@ -324,8 +316,6 @@ Suite
contrib
;
contrib
;
non
-
free
;
non
-
free
;
};
};
OverrideSuite
"unstable"
;
ValidTime
604800
; //
7
days
VersionChecks
VersionChecks
{
{
MustBeNewerThan
MustBeNewerThan
...
...
dak/generate_releases.py
浏览文件 @
7ae8ff59
...
@@ -227,7 +227,7 @@ def main ():
...
@@ -227,7 +227,7 @@ def main ():
architectures
=
get_suite_architectures
(
suite
,
skipall
=
True
,
skipsrc
=
True
)
architectures
=
get_suite_architectures
(
suite
,
skipall
=
True
,
skipsrc
=
True
)
if
SuiteBlock
.
has_key
(
"NotAutomatic"
)
:
if
suiteobj
.
notautomatic
:
notautomatic
=
"yes"
notautomatic
=
"yes"
else
:
else
:
notautomatic
=
""
notautomatic
=
""
...
@@ -266,8 +266,8 @@ def main ():
...
@@ -266,8 +266,8 @@ def main ():
out
.
write
(
"Codename: %s
\n
"
%
(
codename
))
out
.
write
(
"Codename: %s
\n
"
%
(
codename
))
out
.
write
(
"Date: %s
\n
"
%
(
time
.
strftime
(
"%a, %d %b %Y %H:%M:%S UTC"
,
time
.
gmtime
(
time
.
time
()))))
out
.
write
(
"Date: %s
\n
"
%
(
time
.
strftime
(
"%a, %d %b %Y %H:%M:%S UTC"
,
time
.
gmtime
(
time
.
time
()))))
if
SuiteBlock
.
has_key
(
"ValidTime"
)
:
if
suiteobj
.
validtime
:
validtime
=
float
(
SuiteBlock
[
"ValidTime"
]
)
validtime
=
float
(
suiteobj
.
validtime
)
out
.
write
(
"Valid-Until: %s
\n
"
%
(
time
.
strftime
(
"%a, %d %b %Y %H:%M:%S UTC"
,
time
.
gmtime
(
time
.
time
()
+
validtime
))))
out
.
write
(
"Valid-Until: %s
\n
"
%
(
time
.
strftime
(
"%a, %d %b %Y %H:%M:%S UTC"
,
time
.
gmtime
(
time
.
time
()
+
validtime
))))
if
notautomatic
!=
""
:
if
notautomatic
!=
""
:
...
...
daklib/queue.py
浏览文件 @
7ae8ff59
...
@@ -162,18 +162,22 @@ def determine_new(filename, changes, files, warn=1, session = None):
...
@@ -162,18 +162,22 @@ def determine_new(filename, changes, files, warn=1, session = None):
# Fix up the list of target suites
# Fix up the list of target suites
cnf
=
Config
()
cnf
=
Config
()
for
suite
in
changes
[
"suite"
].
keys
():
for
suite
in
changes
[
"suite"
].
keys
():
override
=
cnf
.
Find
(
"Suite::%s::OverrideSuite"
%
(
suite
))
oldsuite
=
get_suite
(
suite
,
session
)
if
override
:
if
not
oldsuite
:
(
olderr
,
newerr
)
=
(
get_suite
(
suite
,
session
)
==
None
,
print
"WARNING: Invalid suite %s found"
%
suite
get_suite
(
override
,
session
)
==
None
)
continue
if
olderr
or
newerr
:
(
oinv
,
newinv
)
=
(
""
,
""
)
if
oldsuite
.
overridesuite
:
if
olderr
:
oinv
=
"invalid "
newsuite
=
get_suite
(
oldsuite
.
overridesuite
,
session
)
if
newerr
:
ninv
=
"invalid "
print
"warning: overriding %ssuite %s to %ssuite %s"
%
(
if
newsuite
:
oinv
,
suite
,
ninv
,
override
)
print
"WARNING: overriding suite %s to suite %s"
%
(
del
changes
[
"suite"
][
suite
]
suite
,
oldsuite
.
overridesuite
)
changes
[
"suite"
][
override
]
=
1
del
changes
[
"suite"
][
suite
]
changes
[
"suite"
][
oldsuite
.
overridesuite
]
=
1
else
:
print
"WARNING: Told to use overridesuite %s for %s but it doesn't exist. Bugger"
%
(
oldsuite
.
overridesuite
,
suite
)
# Check for unprocessed byhand files
# Check for unprocessed byhand files
if
dbchg
is
not
None
:
if
dbchg
is
not
None
:
...
@@ -2361,8 +2365,9 @@ distribution."""
...
@@ -2361,8 +2365,9 @@ distribution."""
file_type
=
binary_type
file_type
=
binary_type
# Override suite name; used for example with proposed-updates
# Override suite name; used for example with proposed-updates
if
cnf
.
Find
(
"Suite::%s::OverrideSuite"
%
(
suite
))
!=
""
:
oldsuite
=
get_suite
(
suite
,
session
)
suite
=
cnf
[
"Suite::%s::OverrideSuite"
%
(
suite
)]
if
oldsuite
.
overridesuite
:
suite
=
oldsuite
.
overridesuite
result
=
get_override
(
package
,
suite
,
component
,
file_type
,
session
)
result
=
get_override
(
package
,
suite
,
component
,
file_type
,
session
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录