Use 45s timeout (the same as already used for wget).

[packages/rpm-build-tools.git] / sort-pkgs

diff --git a/sort-pkgs b/sort-pkgs
index acd5bdd535833da233fafaa571b0ed1507158d64..92de6930887d4a2d91693580695dc510cdd1780d 100755 (executable)
--- a/sort-pkgs
+++ b/sort-pkgs
@@ -12,13 +12,14 @@ import os
 import re
 import sys
 
-PATTERN = re.compile('BuildRequires:\t(.*)-devel')
+PATTERN = re.compile('BuildRequires:\s+(.*?)(\s|$|-devel)')
 DIR = '/home/users/builder/rpm/packages'
 
 packages = {}
 packages_res = {}
 
 def build_requires(name):
+       global packages
        res = []
        with open(os.path.join(DIR, name, name + '.spec'), 'r') as f:
                for line in f:
@@ -30,12 +31,14 @@ def build_requires(name):
        return res
 
 def print_packages(p):
-       if packages_res[p] == 1:
-               return
-       for pp in packages[p]:
-               print_packages(pp)
-       packages_res[p] = 1
-       print p#, packages[p]
+       global packages, packages_res
+
+       if not packages_res[p]:
+               packages_res[p] = 1
+               for pp in packages[p]:
+                       if not packages_res[pp]:
+                               print_packages(pp)
+               print p
 
 if __name__ == "__main__":
        if len(sys.argv) < 2: