test-import uses os.path.join properly and ignores non-directories in the pacman local database.

scripts/akabei-db-import/test-import.py

@@ -21,18 +21,11 @@ except ImportError:
     print "[!!] You need to install the python-pysqlite package to execute this script. Quitting..."
     sys.exit(-1)
 
-# Concatenate two paths (relative or non) safely
-def concatenatePaths(path1, path2):
-    if (path1[-1] != '/'):
-        path1 += "/"
-    path1 += path2
-    return path1
-
 # Reads the package name directly from the main information file
 # This is much safer than obtaining it from the directory name for cause of
 # inconsistencies in version specifications
 def getPackageName(pkgDir):
-    descFile = open(concatenatePaths(pkgDir, "desc"), "r")
+    descFile = open(os.path.join(pkgDir, "desc"), "r")
     isName = False
     
     for line in descFile.readlines():
@@ -68,7 +61,10 @@ def compareDatabases(pacmanDb, akabeiDb):
 
     # Takes every package in the pacman database directory and looks for it in the akabei database
     for pkgDir in os.listdir(pacmanDb):
-        pkgname = getPackageName(concatenatePaths(pacmanDb, pkgDir))
+        if not os.path.isdir(pkgDir):
+            continue
+
+        pkgname = getPackageName(os.path.join(pacmanDb, pkgDir))
         
         query = "SELECT * FROM packages WHERE name='" + pkgname + "'"
         dbcursor.execute(query)
@@ -153,4 +149,4 @@ if __name__ == "__main__":
     if len(diff) > 0:
         print "[!!] Package " + diff + " was found in pacman db but not in akabei db"
     else:
-        print "[**] Test passed."
\ No newline at end of file
+        print "[**] Test passed."