Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
喜羊羊3508
Dak
提交
58afa121
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,发现更多精彩内容 >>
提交
58afa121
编写于
2月 22, 2002
作者:
J
James Troup
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add optional prompt argument to our_raw_input; use it.
上级
a62fdf55
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
23 addition
and
25 deletion
+23
-25
jennifer
jennifer
+6
-7
katie
katie
+6
-7
melanie
melanie
+3
-4
utils.py
utils.py
+8
-7
未找到文件。
jennifer
浏览文件 @
58afa121
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# Checks Debian packages from Incoming
# Checks Debian packages from Incoming
# Copyright (C) 2000, 2001 James Troup <james@nocrew.org>
# Copyright (C) 2000, 2001 James Troup <james@nocrew.org>
# $Id: jennifer,v 1.
6 2002-02-22 01:20:12
troup Exp $
# $Id: jennifer,v 1.
7 2002-02-22 02:19:26
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
...
@@ -44,7 +44,7 @@ re_is_changes = re.compile (r"(.+?)_(.+?)_(.+?)\.changes$");
...
@@ -44,7 +44,7 @@ re_is_changes = re.compile (r"(.+?)_(.+?)_(.+?)\.changes$");
################################################################################
################################################################################
# Globals
# Globals
jennifer_version
=
"$Revision: 1.
6
$"
;
jennifer_version
=
"$Revision: 1.
7
$"
;
Cnf
=
None
;
Cnf
=
None
;
Options
=
None
;
Options
=
None
;
...
@@ -942,12 +942,11 @@ def action ():
...
@@ -942,12 +942,11 @@ def action ():
answer
=
'A'
;
answer
=
'A'
;
while
string
.
find
(
prompt
,
answer
)
==
-
1
:
while
string
.
find
(
prompt
,
answer
)
==
-
1
:
print
prompt
,;
answer
=
utils
.
our_raw_input
(
prompt
);
answer
=
utils
.
our_raw_input
()
m
=
katie
.
re_default_answer
.
match
(
prompt
);
m
=
katie
.
re_default_answer
.
match
(
prompt
)
if
answer
==
""
:
if
answer
==
""
:
answer
=
m
.
group
(
1
)
answer
=
m
.
group
(
1
)
;
answer
=
string
.
upper
(
answer
[:
1
])
answer
=
string
.
upper
(
answer
[:
1
])
;
if
answer
==
'R'
:
if
answer
==
'R'
:
os
.
chdir
(
pkg
.
directory
);
os
.
chdir
(
pkg
.
directory
);
...
...
katie
浏览文件 @
58afa121
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
#
Installs
Debian
packages
#
Installs
Debian
packages
#
Copyright
(
C
)
2000
,
2001
James
Troup
<
james
@
nocrew
.
org
>
#
Copyright
(
C
)
2000
,
2001
James
Troup
<
james
@
nocrew
.
org
>
#
$
Id
:
katie
,
v
1.7
0
2002
-
02
-
13
02
:
38
:
53
troup
Exp
$
#
$
Id
:
katie
,
v
1.7
1
2002
-
02
-
22
02
:
19
:
26
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
...
@@ -39,7 +39,7 @@ import db_access, katie, logging, utils;
...
@@ -39,7 +39,7 @@ import db_access, katie, logging, utils;
###############################################################################
###############################################################################
#
Globals
#
Globals
katie_version
=
"$Revision: 1.7
0
$"
;
katie_version
=
"$Revision: 1.7
1
$"
;
Cnf
=
None
;
Cnf
=
None
;
Options
=
None
;
Options
=
None
;
...
@@ -196,12 +196,11 @@ def action ():
...
@@ -196,12 +196,11 @@ def action ():
answer = 'I';
answer = 'I';
while string.find(prompt, answer) == -1:
while string.find(prompt, answer) == -1:
print prompt,;
answer = utils.our_raw_input(prompt);
answer = utils.our_raw_input()
m = katie.re_default_answer.match(prompt);
m = katie.re_default_answer.match(prompt)
if answer == "":
if answer == "":
answer = m.group(1)
answer = m.group(1)
;
answer = string.upper(answer[:1])
answer = string.upper(answer[:1])
;
if answer == 'R':
if answer == 'R':
do_reject ();
do_reject ();
...
...
melanie
浏览文件 @
58afa121
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
#
General
purpose
package
removal
tool
for
ftpmaster
#
General
purpose
package
removal
tool
for
ftpmaster
#
Copyright
(
C
)
2000
,
2001
James
Troup
<
james
@
nocrew
.
org
>
#
Copyright
(
C
)
2000
,
2001
James
Troup
<
james
@
nocrew
.
org
>
#
$
Id
:
melanie
,
v
1.2
2
2002
-
02
-
12
22
:
14
:
38
troup
Exp
$
#
$
Id
:
melanie
,
v
1.2
3
2002
-
02
-
22
02
:
19
:
26
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
...
@@ -82,8 +82,7 @@ ARCH, BUG#, COMPONENT and SUITE can be space seperated lists, e.g.
...
@@ -82,8 +82,7 @@ ARCH, BUG#, COMPONENT and SUITE can be space seperated lists, e.g.
#
going
to
do
now
?
"
#
going
to
do
now
?
"
def game_over():
def game_over():
print "
Continue
(
y
/
N
)?
",
answer = string.lower(utils.our_raw_input("
Continue
(
y
/
N
)?
"));
answer = string.lower(utils.our_raw_input());
if answer != "
y
":
if answer != "
y
":
print "
Aborted
.
"
print "
Aborted
.
"
sys.exit(1);
sys.exit(1);
...
@@ -395,7 +394,7 @@ def main ():
...
@@ -395,7 +394,7 @@ def main ():
Subst["__BCC__"] = "Bcc: " + string.join(bcc, ", ");
Subst["__BCC__"] = "Bcc: " + string.join(bcc, ", ");
else:
else:
Subst["__BCC__"] = "X-Filler: 42";
Subst["__BCC__"] = "X-Filler: 42";
Subst["__CC__"] = "X-Melanie: $Revision: 1.2
2
$";
Subst["__CC__"] = "X-Melanie: $Revision: 1.2
3
$";
if carbon_copy:
if carbon_copy:
Subst["__CC__"] = Subst["__CC__"] + "\nCc: " + string.join(carbon_copy, ", ");
Subst["__CC__"] = Subst["__CC__"] + "\nCc: " + string.join(carbon_copy, ", ");
Subst["__SUITE_LIST__"] = suites_list;
Subst["__SUITE_LIST__"] = suites_list;
...
...
utils.py
浏览文件 @
58afa121
# Utility functions
# Utility functions
# Copyright (C) 2000, 2001 James Troup <james@nocrew.org>
# Copyright (C) 2000, 2001 James Troup <james@nocrew.org>
# $Id: utils.py,v 1.3
8 2002-02-12 23:15:23
troup Exp $
# $Id: utils.py,v 1.3
9 2002-02-22 02:19:26
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
...
@@ -63,15 +63,16 @@ def touch_file(filename):
...
@@ -63,15 +63,16 @@ def touch_file(filename):
######################################################################################
######################################################################################
# From reportbug
def
our_raw_input
(
prompt
=
""
):
def
our_raw_input
():
if
prompt
:
sys
.
stdout
.
flush
()
sys
.
stdout
.
write
(
prompt
);
sys
.
stdout
.
flush
();
try
:
try
:
ret
=
raw_input
()
ret
=
raw_input
()
;
return
ret
return
ret
except
EOFError
:
except
EOFError
:
sys
.
stderr
.
write
(
'
\n
User interrupt (^D).
\n
'
)
sys
.
stderr
.
write
(
'
\n
User interrupt (^D).
\n
'
)
;
raise
SystemExit
raise
SystemExit
;
######################################################################################
######################################################################################
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录