Move live-installer.pot to po/ directory

Makefile

@@ -18,9 +18,9 @@ run: build
 	build/lib/live-installer/main.py
 
 pot:
-	xgettext -o live-installer.pot --from-code="utf-8" live-installer/resources/*.ui `find live-installer -type f -iname "*.py"`
+	xgettext -o po/live-installer.pot --from-code="utf-8" live-installer/resources/*.ui `find live-installer -type f -iname "*.py"`
 	for file in `ls po/*.po`; do \
-            msgmerge $$file live-installer.pot -o $$file.new ; \
+            msgmerge $$file po/live-installer.pot -o $$file.new ; \
 	    rm -f $$file ; \
 	    mv $$file.new $$file ; \
 	done \

live-installer/main.py

@@ -5,9 +5,6 @@
 from frontend import *
 from frontend.dialogs import ErrorDialog
 
-single_instance()
-
-
 gettext.install("live-installer", "/usr/share/locale")
 sys.path.insert(1, '/lib/live-installer')
 if (os.path.isdir("/lib/live-installer")):
@@ -37,6 +34,9 @@ def exceptdebug(e, v, tb):
         os.environ["TEST"]="1"
     if "--expert" in sys.argv:
         os.environ["EXPERT_MODE"]="1"
+
+    # Check for single instance (after test mode is set)
+    single_instance()
     if not is_root() and "--test" not in sys.argv:
         ErrorDialog(config.get("distro_title", "17g"), _("You must be root!"))
         exit(1)

live-installer/utils.py

@@ -135,7 +135,11 @@ def set_governor(governor):
         i += 1
 
 def single_instance():
-    pidfile = "/run/live-installer.pid"
+    # Use temp directory for PID file in test mode
+    if "TEST" in os.environ:
+        pidfile = "/tmp/live-installer.pid"
+    else:
+        pidfile = "/run/live-installer.pid"
     def writepid():
         with open(pidfile, "w") as f:
             f.write(str(os.getpid()))