summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-11-21 07:19:25 +0000
committerTails developers <amnesia@boum.org>2013-11-21 07:19:25 +0000
commit670c93f341141207baf6fb3b4fe118fa6fdd29b1 (patch)
tree7bff7f7a75526f396273c26d859a69c078b547f1
parentacc954a3a7ffb9fc7c1e78a04a5832850eb7adea (diff)
additional software: sort imports alphabetically
Conflicts: config/chroot_local-includes/usr/local/sbin/tails-additional-software
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/tails-additional-software4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/chroot_local-includes/usr/local/sbin/tails-additional-software b/config/chroot_local-includes/usr/local/sbin/tails-additional-software
index 256f290..96fd60e 100755
--- a/config/chroot_local-includes/usr/local/sbin/tails-additional-software
+++ b/config/chroot_local-includes/usr/local/sbin/tails-additional-software
@@ -1,10 +1,10 @@
#!/usr/bin/env python
import gettext
-import syslog
import os.path
-import sys
import subprocess
+import sys
+import syslog
PERSISTENCE_DIR = "/live/persistence/TailsData_unlocked"
PACKAGES_LIST_FILE = PERSISTENCE_DIR + "/live-additional-software.conf"