Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
喜羊羊3508
Dak
提交
a4c43410
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,发现更多精彩内容 >>
未验证
提交
a4c43410
编写于
5月 18, 2016
作者:
A
Ansgar Burchardt
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'jcristau/by-hash-v5'
上级
8db722e7
116d1a8a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
91 addition
and
49 deletion
+91
-49
dak/clean_suites.py
dak/clean_suites.py
+4
-1
dak/generate_releases.py
dak/generate_releases.py
+87
-48
未找到文件。
dak/clean_suites.py
浏览文件 @
a4c43410
...
...
@@ -386,6 +386,9 @@ SELECT f.id, f.fingerprint FROM fingerprint f
################################################################################
def
clean_byhash
(
now_date
,
session
):
cnf
=
Config
()
suite_suffix
=
cnf
.
find
(
"Dinstall::SuiteSuffix"
,
""
)
Logger
.
log
([
"Cleaning out unused by-hash files..."
])
q
=
session
.
execute
(
"""
...
...
@@ -399,7 +402,7 @@ def clean_byhash(now_date, session):
if
not
Options
[
"No-Action"
]:
for
base
,
suite
,
path
in
q
:
filename
=
os
.
path
.
join
(
base
,
'dists'
,
suite
,
path
)
filename
=
os
.
path
.
join
(
base
,
'dists'
,
suite
,
suite_suffix
,
path
)
try
:
os
.
unlink
(
filename
)
except
OSError
as
exc
:
...
...
dak/generate_releases.py
浏览文件 @
a4c43410
...
...
@@ -117,6 +117,20 @@ class XzFile(object):
(
stdout
,
stderr
)
=
process
.
communicate
()
return
stdout
class
HashFunc
(
object
):
def
__init__
(
self
,
release_field
,
func
,
db_name
):
self
.
release_field
=
release_field
self
.
func
=
func
self
.
db_name
=
db_name
RELEASE_HASHES
=
[
HashFunc
(
'MD5Sum'
,
apt_pkg
.
md5sum
,
'md5'
),
HashFunc
(
'SHA1'
,
apt_pkg
.
sha1sum
,
'sha1'
),
HashFunc
(
'SHA256'
,
apt_pkg
.
sha256sum
,
'sha256'
),
]
class
ReleaseWriter
(
object
):
def
__init__
(
self
,
suite
):
self
.
suite
=
suite
...
...
@@ -180,6 +194,69 @@ class ReleaseWriter(object):
if
e
.
errno
!=
errno
.
EEXIST
:
raise
def
_update_hashfile_table
(
self
,
session
,
fileinfo
,
hashes
):
# Mark all by-hash files as obsolete. We will undo that for the ones
# we still reference later.
query
=
"""
UPDATE hashfile SET unreferenced = CURRENT_TIMESTAMP
WHERE suite_id = :id AND unreferenced IS NULL"""
session
.
execute
(
query
,
{
'id'
:
self
.
suite
.
suite_id
})
if
self
.
suite
.
byhash
:
query
=
"SELECT path FROM hashfile WHERE suite_id = :id"
q
=
session
.
execute
(
query
,
{
'id'
:
self
.
suite
.
suite_id
})
known_hashfiles
=
set
(
row
[
0
]
for
row
in
q
)
updated
=
[]
new
=
[]
# Update the hashfile table with new or updated files
for
filename
in
fileinfo
:
if
not
os
.
path
.
exists
(
filename
):
# probably an uncompressed index we didn't generate
continue
byhashdir
=
os
.
path
.
join
(
os
.
path
.
dirname
(
filename
),
'by-hash'
)
for
h
in
hashes
:
field
=
h
.
release_field
hashfile
=
os
.
path
.
join
(
byhashdir
,
field
,
fileinfo
[
filename
][
field
])
if
hashfile
in
known_hashfiles
:
updated
.
append
(
hashfile
)
else
:
new
.
append
(
hashfile
)
if
updated
:
session
.
execute
(
"""
UPDATE hashfile SET unreferenced = NULL
WHERE path = ANY(:p) AND suite_id = :id"""
,
{
'p'
:
updated
,
'id'
:
self
.
suite
.
suite_id
})
if
new
:
session
.
execute
(
"""
INSERT INTO hashfile (path, suite_id)
VALUES (:p, :id)"""
,
[{
'p'
:
hashfile
,
'id'
:
self
.
suite
.
suite_id
}
for
hashfile
in
new
])
session
.
commit
()
def
_make_byhash_links
(
self
,
fileinfo
,
hashes
):
# Create hardlinks in by-hash directories
for
filename
in
fileinfo
:
if
not
os
.
path
.
exists
(
filename
):
# probably an uncompressed index we didn't generate
continue
for
h
in
hashes
:
field
=
h
.
release_field
hashfile
=
os
.
path
.
join
(
os
.
path
.
dirname
(
filename
),
'by-hash'
,
field
,
fileinfo
[
filename
][
field
])
try
:
os
.
makedirs
(
os
.
path
.
dirname
(
hashfile
))
except
OSError
as
exc
:
if
exc
.
errno
!=
errno
.
EEXIST
:
raise
try
:
os
.
link
(
filename
,
hashfile
)
except
OSError
as
exc
:
if
exc
.
errno
!=
errno
.
EEXIST
:
raise
def
generate_release_files
(
self
):
"""
Generate Release files for the given suite
...
...
@@ -289,8 +366,7 @@ class ReleaseWriter(object):
os
.
chdir
(
self
.
suite_path
())
hashfuncs
=
dict
(
zip
([
x
.
upper
().
replace
(
'UM'
,
'um'
)
for
x
in
suite
.
checksums
],
[
getattr
(
apt_pkg
,
"%s"
%
(
x
))
for
x
in
[
x
.
replace
(
"sum"
,
""
)
+
"sum"
for
x
in
suite
.
checksums
]]))
hashes
=
[
x
for
x
in
RELEASE_HASHES
if
x
.
db_name
in
suite
.
checksums
]
fileinfo
=
{}
...
...
@@ -321,8 +397,8 @@ class ReleaseWriter(object):
fileinfo
[
filename
][
'len'
]
=
len
(
contents
)
for
hf
,
func
in
hashfuncs
.
items
()
:
fileinfo
[
filename
][
hf
]
=
func
(
contents
)
for
hf
in
hashes
:
fileinfo
[
filename
][
hf
.
release_field
]
=
hf
.
func
(
contents
)
for
filename
,
comp
in
uncompnotseen
.
items
():
# If we've already seen the uncompressed file, we don't
...
...
@@ -337,58 +413,21 @@ class ReleaseWriter(object):
fileinfo
[
filename
][
'len'
]
=
len
(
contents
)
for
hf
,
func
in
hashfuncs
.
items
()
:
fileinfo
[
filename
][
hf
]
=
func
(
contents
)
for
hf
in
hashes
:
fileinfo
[
filename
][
hf
.
release_field
]
=
hf
.
func
(
contents
)
for
h
in
sorted
(
hashfuncs
.
keys
()
):
out
.
write
(
'%s:
\n
'
%
h
)
for
field
in
sorted
(
h
.
release_field
for
h
in
hashes
):
out
.
write
(
'%s:
\n
'
%
field
)
for
filename
in
sorted
(
fileinfo
.
keys
()):
out
.
write
(
" %s %8d %s
\n
"
%
(
fileinfo
[
filename
][
h
],
fileinfo
[
filename
][
'len'
],
filename
))
out
.
write
(
" %s %8d %s
\n
"
%
(
fileinfo
[
filename
][
field
],
fileinfo
[
filename
][
'len'
],
filename
))
out
.
close
()
os
.
rename
(
outfile
+
'.new'
,
outfile
)
self
.
_update_hashfile_table
(
session
,
fileinfo
,
hashes
)
if
suite
.
byhash
:
query
=
"""
UPDATE hashfile SET unreferenced = CURRENT_TIMESTAMP
WHERE suite_id = :id AND unreferenced IS NULL"""
session
.
execute
(
query
,
{
'id'
:
suite
.
suite_id
})
for
filename
in
fileinfo
:
if
not
os
.
path
.
exists
(
filename
):
# probably an uncompressed index we didn't generate
continue
for
h
in
hashfuncs
:
hashfile
=
os
.
path
.
join
(
os
.
path
.
dirname
(
filename
),
'by-hash'
,
h
,
fileinfo
[
filename
][
h
])
query
=
"SELECT 1 FROM hashfile WHERE path = :p AND suite_id = :id"
q
=
session
.
execute
(
query
,
{
'p'
:
hashfile
,
'id'
:
suite
.
suite_id
})
if
q
.
rowcount
:
session
.
execute
(
'''
UPDATE hashfile SET unreferenced = NULL
WHERE path = :p and suite_id = :id'''
,
{
'p'
:
hashfile
,
'id'
:
suite
.
suite_id
})
else
:
session
.
execute
(
'''
INSERT INTO hashfile (path, suite_id)
VALUES (:p, :id)'''
,
{
'p'
:
hashfile
,
'id'
:
suite
.
suite_id
})
try
:
os
.
makedirs
(
os
.
path
.
dirname
(
hashfile
))
except
OSError
as
exc
:
if
exc
.
errno
!=
errno
.
EEXIST
:
raise
try
:
os
.
link
(
filename
,
hashfile
)
except
OSError
as
exc
:
if
exc
.
errno
!=
errno
.
EEXIST
:
raise
session
.
commit
()
self
.
_make_byhash_links
(
fileinfo
,
hashes
)
sign_release_dir
(
suite
,
os
.
path
.
dirname
(
outfile
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录