[debian-edu-commits] r78732 - trunk/src/hw-support-handler/hwsupport

[pere at alioth.debian.org]

Author: pere
Date: 2013-01-14 13:53:32 +0000 (Mon, 14 Jan 2013)
New Revision: 78732

Modified:
   trunk/src/hw-support-handler/hwsupport/lookup.py
Log:
Look up both in svn and locally.

Modified: trunk/src/hw-support-handler/hwsupport/lookup.py
===================================================================
--- trunk/src/hw-support-handler/hwsupport/lookup.py	2013-01-14 10:11:29 UTC (rev 78731)
+++ trunk/src/hw-support-handler/hwsupport/lookup.py	2013-01-14 13:53:32 UTC (rev 78732)
@@ -56,21 +56,38 @@
                 thepkgs.append(pkg.name)
     return thepkgs
 
-def pkgs_handling_extra_modaliases(modaliaslist):
+def check_packages_file(fileref, modaliaslist):
     thepkgs = []
-    url = "http://anonscm.debian.org/viewvc/debian-edu/trunk/src/hw-support-handler/modaliases?view=co"
-    f = urllib.urlopen(url)
-    line = f.readline()
+    line = fileref.readline()
     while line:
         header, sep, packagename = line.strip().partition(": ")
-        header, sep, modaliases = f.readline().strip().partition(": ")
-        blank = f.readline()
+        header, sep, modaliases = fileref.readline().strip().partition(": ")
+        blank = fileref.readline()
         for modalias in modaliaslist:
 #            print modalias, modaliases
             if modalias_match(modalias, modaliases):
                 thepkgs.append(packagename)
-        line = f.readline()
-    f.close()
+        line = fileref.readline()
+    fileref.close()
+    return thepkgs
+
+def pkgs_handling_extra_modaliases(modaliaslist):
+    """
+Look up package-hardware mappings from svn and local file
+"""
+    thepkgs = []
+    url = "http://anonscm.debian.org/viewvc/debian-edu/trunk/src/hw-support-handler/modaliases?view=co"
+    f = urllib.urlopen(url)
+    thepkgs = check_packages_file(f, modaliaslist)
+    try:
+        try:
+            f = open("modaliases")
+        except:
+            f = open("/usr/share/hw-support-handler/modaliases")
+        thepkgs.append(check_packages_file(f, modaliaslist))
+        f.close()
+    except:
+        pass
 #    print thepkgs
     return thepkgs
 
@@ -80,13 +97,13 @@
     if 1 < len(sys.argv):
         hwaliases = sys.argv[1]
 
+    print "Locating packages supporting this hardware (extra, svn/local):"
+    for pkg in pkgs_handling_extra_modaliases(hwaliases):
+        print "  %s" %pkg
+
     print "Locating packages supporting this hardware (APT):"
     for pkg in pkgs_handling_apt_modaliases(hwaliases):
         print "  %s" %pkg
 
-    print "Locating packages supporting this hardware (Extra):"
-    for pkg in pkgs_handling_extra_modaliases(hwaliases):
-        print "  %s" %pkg
-
 if __name__ == '__main__':
     main()