merging

Merge branch 'master' of ghghgh.us:photoblaster/photoblaster

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/pb/generate.py b/lib/pb/generate.py
index 31530d2..e915da9 100755
--- a/lib/pb/generate.py
+++ b/lib/pb/generate.py
@@ -107,10 +107,10 @@ class PbGenerate(Pb):
         """Used for the database tag column. Allows for tracking of the type
         of overlay method used."""
         self.tag = _DEFAULT_TAG
-        if self.params.transparent:
-            self.tag = str(self.params.transparent)
         if self.params.background:
-            self.tag = str(self.params.compose)
+            self.tag = "%s:%s" % (self.tag, str(self.params.compose))
+        elif self.params.transparent:
+            self.tag = "%s:%s" % (self.tag, "transparent")
 
         self.filename, self.filepath = self._filename_filepath_create(
             url=self.params.url['url'], extension=self.params.format