From 2c429471b3c4384ec2f3fe23513f6964e8f39a72 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Tue, 28 Sep 2010 08:54:37 +0000
Subject: Do not allow empty string activity_id #1814

Regression was introduced by ad88527353efdb351caef4999c17fdf1f1766662.
---
diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index 657b60e..32a2847 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -217,7 +217,7 @@ def resume(metadata, bundle_id=None):
 
 def launch(bundle, activity_id=None, object_id=None, uri=None, color=None,
            invited=False):
-    if activity_id is None:
+    if activity_id is None or not activity_id:
         activity_id = activityfactory.create_activity_id()
 
     logging.debug('launch bundle_id=%s activity_id=%s object_id=%s uri=%s',
--
cgit v0.9.1