remove unnecessary differences between this and upstream

4 files changed, 6 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index 109f07ae..e6378211 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,8 @@
 *.pyc
 *.swp
 *.swo
-*~
-#*#
 local_settings.py
 archweb.db
 archweb.db-*
-tags
 collected_static/
 testing/
-env/
-repos/
-uploads/
diff --git a/README b/README
index 32f9b2bb..20614897 100644
--- a/README
+++ b/README
@@ -34,9 +34,9 @@ More detail in `requirements.txt` and `requirements_prod.txt`; it is best to
 use virtualenv and pip to handle these. But if you insist on (Arch Linux)
 packages, you will probably want the following:
 
-- mysql-python or python-pysqlite
 - django
-- python-markdown
+- python2-psycopg2
+- python2-markdown
 - python-south
 - python-memcached
 
@@ -55,7 +55,8 @@ packages, you will probably want the following:
         (archweb-env) $ pip install -r requirements.txt
 
 3. Copy `local_settings.py.example` to `local_settings.py` and modify.
-   Make sure to uncomment the appropriate db section (either sqlite or mysql).
+   Make sure to uncomment the appropriate db section (either sqlite or
+   PostgreSQL).
 
 4. Sync the database to create it.
 
diff --git a/local_settings.py.example b/local_settings.py.example
index 5a8d4b26..b452030e 100644
--- a/local_settings.py.example
+++ b/local_settings.py.example
@@ -22,7 +22,6 @@ DATABASES = {
         'PASSWORD': 'parabola',
         'HOST'    : '',
         'PORT'    : '',
-        'OPTIONS' : {},
     },
 }
 
diff --git a/packages/utils.py b/packages/utils.py
index 55a2901a..469dc213 100644
--- a/packages/utils.py
+++ b/packages/utils.py
@@ -111,9 +111,9 @@ SELECT p.id, q.id
         AND p.arch_id != q.arch_id
         AND p.id != q.id
     )
-    WHERE p.arch_id in (%s, %s)
+    WHERE p.arch_id IN (%s, %s)
     AND (
-        q.arch_id in (%s, %s)
+        q.arch_id IN (%s, %s)
         OR q.id IS NULL
     )
     AND (