[projects/pld-ftp-admin] Cleanup duplicate conditionals

[baggins]

commit 0edb3c555c428adadef520415aa83fa2e23f4e66
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jan 5 10:35:08 2019 +0900

    Cleanup duplicate conditionals

 wwwbin/ftp-freshness.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/wwwbin/ftp-freshness.py b/wwwbin/ftp-freshness.py
index 6bb190f..7af8122 100755
--- a/wwwbin/ftp-freshness.py
+++ b/wwwbin/ftp-freshness.py
@@ -85,14 +85,12 @@ class Pkgs(object):
 
         cvs_rpm_vr = rpm.labelCompare(cvs_nvr, pkg_nvr)
         cvs_rpm_v = rpm.labelCompare((cvs_nvr[0], cvs_nvr[1], ""), (pkg_nvr[0], pkg_nvr[1], ""))
-        rpm_cvs_vr = rpm.labelCompare(pkg_nvr, cvs_nvr)
-        rpm_cvs_v = rpm.labelCompare((pkg_nvr[0], pkg_nvr[1], ""), (cvs_nvr[0], cvs_nvr[1], ""))
 
-        if rpm_cvs_v < 0 and cvs_rpm_v > 0:
+        if cvs_rpm_v > 0:
             self.cvs_new_nv.append(name)
-        else:
-            if rpm_cvs_vr < 0 and cvs_rpm_vr > 0 and cvs_nvr[1] == pkg_nvr[1]:
-                self.cvs_new_nvr.append(name)
+            return
+        if cvs_rpm_vr > 0:
+            self.cvs_new_nvr.append(name)
 
     def prepare(self):
         self.cvs_new_nvr.sort()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-ftp-admin.git/commitdiff/0edb3c555c428adadef520415aa83fa2e23f4e66