Dev new recipe logic

Code/autopkgcmd/opts.py

@@ -15,7 +15,7 @@
 import optparse
 from typing import List, Tuple
 
-from autopkglib import globalPreferences
+from autopkglib.prefs import globalPreferences
 
 
 def gen_common_parser() -> optparse.OptionParser:

Code/autopkglib/MunkiInstallsItemsCreator.py

@@ -18,8 +18,8 @@
 import plistlib
 import subprocess
 
-from autopkglib import APLooseVersion, Processor, ProcessorError
-from autopkglib.common import log
+from autopkglib import Processor, ProcessorError
+from autopkglib.common import APLooseVersion, log
 
 try:
     from Foundation import NSDictionary

Code/autopkglib/SparkleUpdateInfoProvider.py

@@ -21,7 +21,8 @@
 from urllib.parse import quote, urlencode, urlsplit, urlunsplit
 from xml.etree import ElementTree
 
-from autopkglib import APLooseVersion, ProcessorError
+from autopkglib.common import APLooseVersion
+from autopkglib import ProcessorError
 from autopkglib.URLGetter import URLGetter
 
 __all__ = ["SparkleUpdateInfoProvider"]

Code/autopkglib/URLGetter.py

@@ -20,7 +20,9 @@
 import subprocess
 from typing import List
 
-from autopkglib import Processor, ProcessorError, find_binary, is_windows
+from autopkglib import Processor, ProcessorError
+from autopkglib.apgit import find_binary
+from autopkglib.common import is_windows
 
 __all__ = ["URLGetter"]