From 157fed65f68346ec2fdc33bd625c5ae8460bccf7 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Tue, 5 Nov 2024 16:47:23 -0500
Subject: [PATCH 1/2] fix double target printing

---
 bbot/scanner/preset/preset.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/bbot/scanner/preset/preset.py b/bbot/scanner/preset/preset.py
index a8fe471b4b..6c60b91785 100644
--- a/bbot/scanner/preset/preset.py
+++ b/bbot/scanner/preset/preset.py
@@ -274,6 +274,12 @@ def target(self):
             raise ValueError("Cannot access target before preset is baked (use ._seeds instead)")
         return self._target
 
+    @property
+    def seeds(self):
+        if self._seeds is None:
+            raise ValueError("Cannot access target before preset is baked (use ._seeds instead)")
+        return self.target.seeds
+
     @property
     def whitelist(self):
         if self._target is None:
@@ -376,6 +382,9 @@ def merge(self, other):
         # misc
         self.force_start = self.force_start | other.force_start
         self._cli = self._cli | other._cli
+        # transfer args
+        if other._args is not None:
+            self._args = other._args
 
     def bake(self, scan=None):
         """
@@ -750,11 +759,11 @@ def to_dict(self, include_target=False, full_config=False, redact_secrets=False)
 
         # scope
         if include_target:
-            target = sorted(str(t.data) for t in self.target.seeds)
+            target = sorted(self.target.seeds.inputs)
             whitelist = []
             if self.target.whitelist is not None:
-                whitelist = sorted(str(t.data) for t in self.target.whitelist)
-            blacklist = sorted(str(t.data) for t in self.target.blacklist)
+                whitelist = sorted(self.target.whitelist.inputs)
+            blacklist = sorted(self.target.blacklist.inputs)
             if target:
                 preset_dict["target"] = target
             if whitelist and whitelist != target:

From 442daa66da2f97b5477fe6e12e7884314133abc1 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Wed, 6 Nov 2024 10:39:33 -0500
Subject: [PATCH 2/2] fix

---
 bbot/scanner/preset/preset.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/bbot/scanner/preset/preset.py b/bbot/scanner/preset/preset.py
index 6c60b91785..386dbbe182 100644
--- a/bbot/scanner/preset/preset.py
+++ b/bbot/scanner/preset/preset.py
@@ -274,12 +274,6 @@ def target(self):
             raise ValueError("Cannot access target before preset is baked (use ._seeds instead)")
         return self._target
 
-    @property
-    def seeds(self):
-        if self._seeds is None:
-            raise ValueError("Cannot access target before preset is baked (use ._seeds instead)")
-        return self.target.seeds
-
     @property
     def whitelist(self):
         if self._target is None:
@@ -759,11 +753,11 @@ def to_dict(self, include_target=False, full_config=False, redact_secrets=False)
 
         # scope
         if include_target:
-            target = sorted(self.target.seeds.inputs)
+            target = sorted(str(t.data) for t in self.target.seeds)
             whitelist = []
             if self.target.whitelist is not None:
-                whitelist = sorted(self.target.whitelist.inputs)
-            blacklist = sorted(self.target.blacklist.inputs)
+                whitelist = sorted(str(t.data) for t in self.target.whitelist)
+            blacklist = sorted(str(t.data) for t in self.target.blacklist)
             if target:
                 preset_dict["target"] = target
             if whitelist and whitelist != target: