lbkit 0.6.2__tar.gz → 0.6.3__tar.gz

{lbkit-0.6.2/lbkit.egg-info → lbkit-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lbkit
-Version: 0.6.2
+Version: 0.6.3
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

lbkit-0.6.3/lbkit/__init__.py

@@ -0,0 +1,2 @@
+
+__version__ = '0.6.3'

{lbkit-0.6.2 → lbkit-0.6.3}/lbkit/component/build.py

@@ -71,7 +71,10 @@ class BuildComponent():
         self.pkg = None
         self.base_cmd = ""
         self.gen_conaninfo()
-        self.base_cmd += f" --user {self.user} --channel {self.channel}"
+        # 此场景发布的包名不带@user/channel
+        if self.user != "litebmc" or self.channel != "release":
+            self.base_cmd += f" --user {self.user} --channel {self.channel}"
+
         self.base_cmd += f" -pr {self.profile} -s build_type={self.build_type} -r " + self.options.remote
         self.base_cmd += f" -pr:b {self.profile_build}"
         if self.options.cov:
@@ -126,8 +129,9 @@ class BuildComponent():
         self.name = pkg.get("name")
         self.version = pkg.get("version")
 
-        self.package = self.name + "/" + self.version + \
-            "@" + self.user + "/" + self.channel
+        self.package = self.name + "/" + self.version
+        if self.user != "litebmc" or self.channel != "release":
+            self.package += "@" + self.user + "/" + self.channel
         # 准备部署依赖
         requires = pkg.get("requires")
         deps = []
@@ -190,8 +194,12 @@ class BuildComponent():
     def build(self):
         log.info(os.getcwd())
 
-        export_cmd = f"conan export . --user={self.user} --channel={self.channel}"
+        export_cmd = "conan export . "
+        if self.user != "litebmc" or self.channel != "release":
+            export_cmd += f"--user={self.user} --channel={self.channel}"
         tools.run(export_cmd, capture_output=False)
+        # import sys
+        # sys.exit(-1)
 
         lockfile = os.path.join(cwd, ".temp", "conan.lock")
         graphfile = os.path.join(cwd, ".temp", "graph.info")

{lbkit-0.6.2 → lbkit-0.6.3}/lbkit/component/template/conanbase.mako

@@ -28,8 +28,11 @@ libs = pkg.get("package_info", {}).get("libs", [])
 class LiteBmcConan(ConanFile):
     name = "${pkg_name}"
     version = "${pkg["version"]}"
+% if pkg["user"] != "litebmc" or pkg["channel"] != "release":
+## @litebmc/release则生成的包名不带@user/channel
     user = "${pkg["user"]}"
     channel = "${pkg["channel"]}"
+% endif
     settings = "os", "arch", "compiler", "build_type"
     description = "${pkg["description"]}"
     url = "${pkg["url"]}"
@@ -78,16 +81,12 @@ class LiteBmcConan(ConanFile):
             return
 
         scm_url = None
-        remotes = git.run("remote -v")
-        checked_name = []
-        for r in remotes.splitlines():
-            name, url = r.split(maxsplit=1)
-            if name in checked_name:
-                continue
-            checked_name.append(name)
-            url, scm_commit = git.get_url_and_commit(remote=name)
-            if url.startswith("https://"):
-                scm_url = url
+        scm_commit = git.get_commit()
+        branches = git.run("branch -r --contains {}".format(scm_commit))
+        remotes = git.run("remote")
+        for remote in remotes.splitlines():
+            if "{}/".format(remote) in branches:
+                scm_url = git.get_remote_url(remote)
                 break
         if not scm_url:
             files.update_conandata(self, {"sources": {"commit": None, "url": None, "pwd": os.getcwd()}})

{lbkit-0.6.2 → lbkit-0.6.3/lbkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lbkit
-Version: 0.6.2
+Version: 0.6.3
 Summary: Tools provided by litebmc.com
 Home-page: https://www.litebmc.com
 Author: xuhj@litebmc.com

lbkit-0.6.2/lbkit/__init__.py

@@ -1,2 +0,0 @@
-
-__version__ = '0.6.2'