Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

solitary: Fix handling of symlink items

The item targetted by a symlink must be loaded, so that its dependencies
are resolved and considered for inclusion in the bundle.
  • Loading branch information...
commit a1f0eebc1b361ce53482b8ac1de5a5c5c514edd9 1 parent 1a8fe61
@bl8 bl8 authored
Showing with 7 additions and 2 deletions.
  1. +1 −1  solitary/Item.cs
  2. +6 −1 solitary/SymlinkItem.cs
View
2  solitary/Item.cs
@@ -70,7 +70,7 @@ public bool IsValidConfinementItem (Item item, bool checkExists)
{
if (!String.IsNullOrEmpty (ProcessTools.RealConfinementRoot) &&
item.File.FullName.StartsWith (ProcessTools.RealConfinementRoot)) {
- string path = file.FullName.Replace (ProcessTools.RealConfinementRoot, Confinement.ConfinementRoot);
+ string path = item.File.FullName.Replace (ProcessTools.RealConfinementRoot, Confinement.ConfinementRoot);
item.File = new FileInfo (path);
}
View
7 solitary/SymlinkItem.cs
@@ -51,8 +51,13 @@ public override IEnumerable<Item> Load ()
}
yield return this;
- yield return Item.Resolve (Confinement,
+
+ var item = Item.Resolve (Confinement,
new FileInfo (link.GetContents ().FullName));
+
+ foreach (var child_item in item.Load ()) {
+ yield return child_item;
+ }
}
public override void Relocate ()

0 comments on commit a1f0eeb

Please sign in to comment.
Something went wrong with that request. Please try again.