From e1775203792be2bc624c43fad88f45762ec4746d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 24 Jun 2025 10:53:37 +0200 Subject: [PATCH 1/2] nightly: include project's LICENSE in the nightly repo --- fdroidserver/nightly.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fdroidserver/nightly.py b/fdroidserver/nightly.py index 5156fb9a..f53fa867 100644 --- a/fdroidserver/nightly.py +++ b/fdroidserver/nightly.py @@ -399,6 +399,8 @@ def main(): clone_git_repo(clone_url, git_mirror_repodir) if not os.path.isdir(git_mirror_repodir): os.makedirs(git_mirror_repodir, mode=0o755) + if os.path.exists('LICENSE'): + shutil.copy2('LICENSE', git_mirror_path) mirror_git_repo = git.Repo.init(git_mirror_path) writer = mirror_git_repo.config_writer() From d71fba164c2a8b96c6bbb2be0ccda87fdc9735aa Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 24 Jun 2025 10:53:59 +0200 Subject: [PATCH 2/2] nightly: fix bug that clones nightly repo to wrong location bug introduced in ce018158ee33f330cf0b3db84896fcc236d7832f from !1563 --- fdroidserver/nightly.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/nightly.py b/fdroidserver/nightly.py index f53fa867..3d57c452 100644 --- a/fdroidserver/nightly.py +++ b/fdroidserver/nightly.py @@ -396,7 +396,7 @@ def main(): git_mirror_repodir = os.path.join(git_mirror_fdroiddir, 'repo') git_mirror_metadatadir = os.path.join(git_mirror_fdroiddir, 'metadata') if not os.path.isdir(git_mirror_repodir): - clone_git_repo(clone_url, git_mirror_repodir) + clone_git_repo(clone_url, git_mirror_path) if not os.path.isdir(git_mirror_repodir): os.makedirs(git_mirror_repodir, mode=0o755) if os.path.exists('LICENSE'):