Commits

Garth Johnson committed 42d3fb3

System install and check bugs fixed

  • Participants
  • Parent commits a7e2f95

Comments (0)

Files changed (2)

File djaboto/__init__.py

 # -*- coding: utf-8 -*-
-VERSION = (0,0,6,'alpha',2)
+VERSION = (0,0,6,'alpha',3)
+
+import debian
 
 def get_version(version=None):
     """Derives a PEP386-compliant version number from VERSION."""

File djaboto/debian.py

     print "...performing system updates"
     check_call(['sudo', 'apt-get', 'update', '-y'])
     check_call(['sudo', 'apt-get', 'dist-upgrade', '-y'])
-    check_call(['sudo', 'apt-get', 'install', '-y', 'python-setuptools', 'python-dev', 'python-virtualenv', 'git-core', 'mercurial', 'gcc', 'unison', 'python-pip', 'node-less', 'libtidy-dev'])
-
-    # Install Apache and necessary components
-    check_call(['sudo', 'apt-get', 'install', '-y', 'apache2', 'libapache2-mod-wsgi'])
+    check_call(['sudo', 'apt-get', 'install', '-y',
+                'build-essential',
+                'python-setuptools',
+                'python-dev',
+                'python-virtualenv',
+                'git-core',
+                'mercurial',
+                'gcc',
+                'unison',
+                'python-pip',
+                'node-less',
+                'libtidy-dev',
+                'apache2',
+                'libapache2-mod-wsgi'])
 
     # Install PIL support for Virtual Environment on 64 bit systems
     ###TODO: check if this IS a 64bit system before even trying to do this
     try:
-        check_call(['sudo', 'apt-get', 'install', '-y', 'python-imaging', 'libjpeg62-dev', 'libjpeg62', 'libjpeg8'])
+        check_call(['sudo', 'apt-get', 'install', '-y', 'libjpeg62-dev', 'libjpeg62', 'libjpeg8' ])
         if not os.path.lexists('/usr/lib/libz.so'):
             os.symlink('/usr/lib/x86_64-linux-gnu/libz.so', '/usr/lib/libz.so')
         if not os.path.lexists('/usr/lib/libjpeg.so'):
             os.symlink('/usr/lib/x86_64-linux-gnu/libjpeg.so', '/usr/lib/libjpeg.so')
+        # Now that everything is in place for a complete compile, lets add the imaging library WITH JPEG and GIF support
+        check_call(['sudo', 'apt-get', 'install', '-y', 'python-imaging' ])
     except:
         pass
 
     print '...adding MySQL components'
-    check_call(['sudo', 'apt-get', 'install', '-y', 'mysql-server', 'mysql-client', 'python-mysqldb', 'libmysqlclient-dev', 'build-essential', 'python-dev'])
+    check_call(['sudo', 'apt-get', 'install', '-y', 'mysql-server', 'mysql-client', 'python-mysqldb', 'libmysqlclient-dev'])