From 67038ba1840d0f57b0ce49fdabd3dfa8057e2451 Mon Sep 17 00:00:00 2001
From: Joshua Haase <hahj87@gmail.com>
Date: Mon, 11 Apr 2011 00:22:06 -0700
Subject: fixed some errors

---
 clean_repo.py | 2 +-
 config.py     | 4 ++--
 config.sh     | 2 ++
 cptobin.sh    | 2 +-
 filter.py     | 8 ++++----
 mkpending.py  | 4 ++--
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/clean_repo.py b/clean_repo.py
index 29d446d..b0d306f 100755
--- a/clean_repo.py
+++ b/clean_repo.py
@@ -34,7 +34,7 @@ if __name__ == "__main__":
     args=parser.parse_args()
 
     if args.directory:
-        cleanup_nonfree_in_dir(args.database, listado(config["blacklist"]))
+        cleanup_nonfree_in_dir(args.directory, listado(config["blacklist"]))
 
     if args.database:
         pkgs=pkginfo_from_db(args.database)
diff --git a/config.py b/config.py
index 24ecfaf..f4089f9 100755
--- a/config.py
+++ b/config.py
@@ -6,8 +6,8 @@ except(ImportError):
     from commands import getoutput as check_output
 import os
 
-stringvars=("mirror", "mirrorpath", "logname", "tempdir", "docs_dir",
-            "repodir", "rsync_blacklist")
+stringvars=("mirror", "mirrorpath", "logname", "tempdir", "archdb", "docs_dir",
+            "repodir", "blacklist", "whitelist", "pending", "rsync_blacklist")
 listvars=("repo_list", "dir_list", "arch_list", "other",)
 boolvars=("output", "debug",)
 
diff --git a/config.sh b/config.sh
index 741dee4..4f42e0b 100755
--- a/config.sh
+++ b/config.sh
@@ -12,6 +12,7 @@ logtime=$(date -u +%Y%m%d-%H:%M)
 ## Must be defined
 logname=${paraboladir}/${logtime}-repo-maintainer.log
 tempdir=~/tmp/
+archdb=${tempdir}/db
 docs_dir=${paraboladir}/docs
 repodir=${paraboladir}/repo
 # End Directories
@@ -42,6 +43,7 @@ function run_python_cmd {
 	mirrorpath=${mirrorpath} \
 	logname=${logname} \
 	tempdir=${tempdir} \
+	archdb=${archdb} \
 	docs_dir=${docs_dir} \
 	repodir=${repodir} \
 	blacklist=${blacklist} \
diff --git a/cptobin.sh b/cptobin.sh
index 25a22d4..e803132 100755
--- a/cptobin.sh
+++ b/cptobin.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-cp -f clean_repo.py config.py config.sh main.sh mkpending.py filter.py ~/usr/bin/
\ No newline at end of file
+cp -f clean_repo.py config.py config.sh get_license.sh main.sh mkpending.py filter.py ~/usr/bin/
\ No newline at end of file
diff --git a/filter.py b/filter.py
index 1a0fa6f..78ad410 100755
--- a/filter.py
+++ b/filter.py
@@ -137,15 +137,15 @@ def pkginfo_from_db(path_to_db):
     if not os.path.isfile(path_to_db):
         raise NonValidFile(path_to_db + "is not a file")
     
-    check_output("mkdir -p " + archdb)
+    check_output("mkdir -p " + config["archdb"])
 
     try:
-        db_open_tar = tarfile.open(db_tar_file, 'r:gz')
+        db_open_tar = tarfile.open(path_to_db, 'r:gz')
     except tarfile.ReadError:
-        printf("No valid db_file %s or not readable" % db_tar_file)
+        printf("No valid db_file %s or not readable" % path_to_db)
         return(tuple())
     else:
-        printf("No db_file %s" % db_tar_file)
+        printf("No db_file %s" % path_to_db)
         return(tuple())
 
     for file in db_open_tar.getmembers():
diff --git a/mkpending.py b/mkpending.py
index 43a5fb2..2b255a8 100755
--- a/mkpending.py
+++ b/mkpending.py
@@ -32,9 +32,9 @@ def write_pending(packages_iterable, repo, prefix=config["pending"]):
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
         description="Clean a repo db and packages")
-    parser.add_argument("-b", "--dababase", type=str, required=True
+    parser.add_argument("-b", "--dababase", type=str, required=True,
                         help="database to check")
-    parser.add_argument("-r", "--repo", type=str, required=True
+    parser.add_argument("-r", "--repo", type=str, required=True,
                         help="repo of database")
     args=parser.parse_args()
 
-- 
cgit v1.2.3-54-g00ecf