From 1f9ac444a5066a25114df8f05ca6eda12c6114d9 Mon Sep 17 00:00:00 2001
From: Balthasar Reuter <6384870+reuterbal@users.noreply.github.com>
Date: Thu, 7 Mar 2024 14:45:54 +0100
Subject: [PATCH 1/3] Fix help string for --list-archs

---
 bin/ecbundle-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ecbundle-build b/bin/ecbundle-build
index 6518c44..4c58127 100755
--- a/bin/ecbundle-build
+++ b/bin/ecbundle-build
@@ -71,7 +71,7 @@ def main():
     parser.add_argument('--arch',
                         help='Path to directory containing architecture info')
     parser.add_argument('--list-archs',
-                        help='Path to directory containing architecture info',
+                        help='List the available architectures',
                         action='store_true')
 
     parser.add_argument('--src-dir',

From 0f31b68dc8af25e08ecf10d2cec67f61ce00d23b Mon Sep 17 00:00:00 2001
From: Ahmad Nawab <113430901+awnawab@users.noreply.github.com>
Date: Thu, 21 Mar 2024 15:42:16 +0100
Subject: [PATCH 2/3] Projects can now also be symlinked to subdirs of
 symlinked projects (#8)

---
 ecbundle/download.py                            |  2 ++
 ...ndle_subdir.yml => bundle_cloned_subdir.yml} |  0
 .../bundle_download/bundle_symlinked_subdir.yml | 16 ++++++++++++++++
 tests/bundle_download/test_download.py          | 17 +++++++++++++++--
 4 files changed, 33 insertions(+), 2 deletions(-)
 rename tests/bundle_download/{bundle_subdir.yml => bundle_cloned_subdir.yml} (100%)
 create mode 100644 tests/bundle_download/bundle_symlinked_subdir.yml

diff --git a/ecbundle/download.py b/ecbundle/download.py
index efe9ac0..16c3a1d 100644
--- a/ecbundle/download.py
+++ b/ecbundle/download.py
@@ -351,6 +351,8 @@ def download_data(data_packages, download_dir):
                 or project.dir() in [p.name for p in git_projects]
                 or os.path.dirname(project.dir()) in [p.name for p in git_projects]
                 or project.dir() in [p.name() for p in symlink_projects]
+                or os.path.dirname(project.dir())
+                in [p.name() for p in symlink_projects]
             ):
                 symlink_projects.append(project)
             else:
diff --git a/tests/bundle_download/bundle_subdir.yml b/tests/bundle_download/bundle_cloned_subdir.yml
similarity index 100%
rename from tests/bundle_download/bundle_subdir.yml
rename to tests/bundle_download/bundle_cloned_subdir.yml
diff --git a/tests/bundle_download/bundle_symlinked_subdir.yml b/tests/bundle_download/bundle_symlinked_subdir.yml
new file mode 100644
index 0000000..b342b5b
--- /dev/null
+++ b/tests/bundle_download/bundle_symlinked_subdir.yml
@@ -0,0 +1,16 @@
+### Bundle
+
+name    : test-symlink-subdir
+
+projects :
+    - project1 :
+        git     : ${BITBUCKET}/user/project1
+        version : 0.0.1
+        bundle  : false
+
+    - symlink_project1 :
+        dir     : project1
+
+    - subdir1 :
+        dir     : symlink_project1/subdir1
+        bundle  : false
diff --git a/tests/bundle_download/test_download.py b/tests/bundle_download/test_download.py
index a9833e6..d494367 100644
--- a/tests/bundle_download/test_download.py
+++ b/tests/bundle_download/test_download.py
@@ -313,14 +313,27 @@ def test_download_https(args, here, watcher):
     assert "git -c advice.detachedHead=false checkout 0.0.1" in watcher.output
 
 
-def test_symlink_subdir(args, here, project1_subdir1_dir, watcher):
+def test_symlink_cloned_project_subdir(args, here, project1_subdir1_dir, watcher):
     """
     Add cloned project subdir as a symlinked bundle entry
     """
-    args["bundle"] = "%s" % (here / "bundle_subdir.yml")
+    args["bundle"] = "%s" % (here / "bundle_cloned_subdir.yml")
 
     with watcher:
         BundleDownloader(**args).download()
 
     assert ("Following projects are symlinked in") in watcher.output
     assert "- subdir1 (project1/subdir1)" in watcher.output
+
+
+def test_symlink_symlinked_project_subdir(args, here, project1_subdir1_dir, watcher):
+    """
+    Add symlinked project subdir as a symlinked bundle entry
+    """
+    args["bundle"] = "%s" % (here / "bundle_symlinked_subdir.yml")
+
+    with watcher:
+        BundleDownloader(**args).download()
+
+    assert ("Following projects are symlinked in") in watcher.output
+    assert "- subdir1 (symlink_project1/subdir1)" in watcher.output

From 6bcb188841d554e0ff99dcac8c79d904f1db9aee Mon Sep 17 00:00:00 2001
From: Willem Deconinck <willem.deconinck@ecmwf.int>
Date: Thu, 21 Mar 2024 15:44:26 +0100
Subject: [PATCH 3/3] Version 2.1.1

---
 ecbundle/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecbundle/__init__.py b/ecbundle/__init__.py
index 9df9d91..428e301 100644
--- a/ecbundle/__init__.py
+++ b/ecbundle/__init__.py
@@ -16,4 +16,4 @@
 from ecbundle.project import *  # noqa
 from ecbundle.util import *  # noqa
 
-__version__ = "2.1.0"
+__version__ = "2.1.1"