Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #1

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixes #1

wants to merge 4 commits into from

Conversation

csware
Copy link

@csware csware commented Jul 3, 2016

  • If a subfolder A of a site folder is named like a folder B in the root (/), then the folder B is taken instead of A.
  • Fix endless recursion and make sure we stay in site.dest on Windows

csware added 3 commits July 3, 2016 06:09
On Windows parent_dir can be 'd:/' causing an endless recursion.

Signed-off-by: Sven Strickroth <[email protected]>
If a subfolder A of a site folder is named like a folder B in the root (/), then the folder B is taken instead of A.

Signed-off-by: Sven Strickroth <[email protected]>
@sumdog
Copy link
Owner

sumdog commented Jul 12, 2016

The 2nd commit is unnecessary. Jekyll-paginate is not a dependency. Notices in lines 135/136 it does a begin and recover, so pagination isn't required, but if it's there, it will patch it.

@sumdog
Copy link
Owner

sumdog commented Jul 12, 2016

I'm going to try and write some unit tests this weekend so I can test this against newer versions of Jekyll as they come out. I'll merge in your changes then. Thanks :)

@csware
Copy link
Author

csware commented Jul 12, 2016

@sumdog If paginate is not there I'll get errors.

@sumdog
Copy link
Owner

sumdog commented Jul 12, 2016

@csware Interesting. What error are you seeing?

@csware
Copy link
Author

csware commented Aug 2, 2016

Sorry it took so long. It's easy to test so I thought you test it yourself. Just remvoe the jekyll-paginate-1.1.0 folder from lib\ruby\gems\2.2.0\gems and run jekyll.

Dependency Error: Yikes! It looks like you don't have jekyll-paginate or one o
f its dependencies installed. In order to use Jekyll as currently configured, yo
u'll need to install this gem. The full error message from Ruby is: 'cannot load
such file -- jekyll-paginate' If you run into trouble, you can find helpful res
ources at http://jekyllrb.com/help/!
jekyll 3.1.6 | Error: jekyll-paginate

Btw. I don't see any try-catch for paginate here: https://github.com/sumdog/jekyll-multisite/blob/master/lib/jekyll-multisite.rb#L136, it's always required.

Fixes a regression introduced in commit 5b3dc16.

Signed-off-by: Sven Strickroth <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants