diff options
| author | Herve Quiroz <hq@FreeBSD.org> | 2005-04-15 00:30:48 +0000 |
|---|---|---|
| committer | Herve Quiroz <hq@FreeBSD.org> | 2005-04-15 00:30:48 +0000 |
| commit | 3348a9eb041d099febe84ce4226f0e6b95e32bce (patch) | |
| tree | 89a62db6f095ad29f3931c09a797c9c9f13850a3 /www/resin2/files/resinctl | |
| parent | Add patch to fix the kinfocenter PCI module (KDE Bug 101686) (diff) | |
- Unbreak: variable evaluation (WRKSRC) could not postponed due to some .for
loops. The loops are now either unrolled or implemented as shell loops. [1]
- ECHO_CMD -> ECHO_MSG when displaying information to the user
- Improve resinctl [2]
PR: 79707
Submitted by: Boris Kovalenko <boris@tagnet.ru> [1], maintainer [2]
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=133370
Diffstat (limited to 'www/resin2/files/resinctl')
| -rw-r--r-- | www/resin2/files/resinctl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/www/resin2/files/resinctl b/www/resin2/files/resinctl index 07be5c788618..e503fe1c9041 100644 --- a/www/resin2/files/resinctl +++ b/www/resin2/files/resinctl @@ -105,10 +105,10 @@ def start(): # Wait a little time.sleep(.4) - (unused_pid, status) = os.waitpid(pid, os.WNOHANG) + (status_pid, status) = os.waitpid(pid, os.WNOHANG) # Check program exit status, if available - if unused_pid != 0 and os.WIFEXITED(status): + if status_pid != 0 and os.WIFEXITED(status): sys.stderr = os.fdopen(orig_stderr, 'w') print >> sys.stderr, 'Could not start %s. Check %s for errors.' % (APP_NAME, LOG_FILE) sys.exit(2) @@ -153,7 +153,6 @@ if __name__ == '__main__': LOG_FILE = "%%LOG_FILE%%" APP_NAME = "%%APP_NAME%%" APP_HOME = "%%APP_HOME%%" - CONTROL_PROGRAM = "%%APP_NAME%%ctl" PID_FILE = "%%PID_FILE%%" COMMAND = "%%JAVA%%" ARGS = [COMMAND] |