commit 524fc98af2da22dbd9930f388ff07fb06abe17e6
Author: Arkadiusz Miśkiewicz <[email protected]>
Date:   Wed Sep 1 15:38:10 2021 +0200

    Rel 5; pure-uploadscript retval has meaning only if it is enabled

 pure-ftpd.init | 9 +++++++--
 pure-ftpd.spec | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index a2b2071..9c09bbd 100644
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -9,7 +9,7 @@
 %bcond_without tls             # disable SSL/TLS support
 %bcond_without cap             # disable capabilities
 
-%define        rel     4
+%define        rel     5
 Summary:       Small, fast and secure FTP server
 Summary(pl.UTF-8):     Mały, szybki i bezpieczny serwer FTP
 Name:          pure-ftpd
diff --git a/pure-ftpd.init b/pure-ftpd.init
index 2805f1e..43a3568 100644
--- a/pure-ftpd.init
+++ b/pure-ftpd.init
@@ -133,9 +133,14 @@ case "$1" in
        ;;
   status)
        status pure-ftpd
-       status pure-uploadscript
        RETVAL=$?
-       if [ $RETVAL -eq 0 ]; then
+       PUREFTPDRETVAL=$RETVAL
+
+       status pure-uploadscript
+       if [ -n "$UPLOADSCRIPT" ]; then
+         RETVAL=$?
+       fi
+       if [ $PUREFTPDRETVAL -eq 0 ]; then
                pure-ftpwho
        fi
        ;;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pure-ftpd.git/commitdiff/524fc98af2da22dbd9930f388ff07fb06abe17e6

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to