1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
#! /bin/sh -e
## 11-UsingOfEnvironmentVariables.dpatch by Raphael bossek <bossekr@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
case "$1" in
-patch) patch -p1 ${patch_opts} < $0;;
-unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad /home/bossekr/src/4suite/python-4suite-0.99cvs20040514/4Suite/Ft/Server/Server/Commands/CommandUtil.py python-4suite-0.99cvs20040514/4Suite/Ft/Server/Server/Commands/CommandUtil.py
--- /home/bossekr/src/4suite/python-4suite-0.99cvs20040514/4Suite/Ft/Server/Server/Commands/CommandUtil.py Tue Oct 7 05:33:54 2003
+++ python-4suite-0.99cvs20040514/4Suite/Ft/Server/Server/Commands/CommandUtil.py Fri Jun 11 20:06:48 2004
@@ -19,10 +19,10 @@
properties = ConfigFile.Read(options.get('config-file'))
properties = properties[coreId]
- userName = None
-
if options.has_key('username'):
userName = options['username']
+ else:
+ userName = os.environ.get('FTSS_USERNAME', None)
#Nope, ask for it
if not userName:
@@ -30,9 +30,10 @@
sys.stderr.flush()
userName = raw_input()
- passwdHash = None
if options.has_key('password'):
passwdHash = sha.new(options['password']).hexdigest()
+ else:
+ passwdHash = os.environ.get('FTSS_PASSWORD', None)
if passwdHash is None:
passwdHash = sha.new(getpass.getpass("Password for %s: " % userName)).hexdigest()
|
