On trunk, charmhelpers/__init__.py detects that six is not installed and installs the python-six package with apt.
If your charmhelpers/__init__.py is empty, you managed to sync trunk when it was broken. Updating charm-helpers should fix your problem.
If the import code is in charmhelpers/__init__.py, then we need to understand why it is not being invoked as it was when we tested it.
On trunk, charmhelpers/ __init_ _.py detects that six is not installed and installs the python-six package with apt.
If your charmhelpers/ __init_ _.py is empty, you managed to sync trunk when it was broken. Updating charm-helpers should fix your problem.
If the import code is in charmhelpers/ __init_ _.py, then we need to understand why it is not being invoked as it was when we tested it.