git_deploy's hook_requirements implementation is poorly done.
If the Glip library is not found the following message is displayed in green (i.e. REQUIREMENT_OK) on the status page:
Glip Library See the instructions in sites/all/modules/git_deploy/README.txt
The Glip library must be present to use git_deploy.
Confusing at best.
| Comment | File | Size | Author |
|---|---|---|---|
| #13 | clean-up-git-deploy-requirements-1212942-13.patch | 1.54 KB | adammalone |
| #10 | clean-up-git-deploy-requirements-1212942-10.patch | 3.63 KB | adammalone |
| #8 | 1212942-8-hook_requirements.patch | 1.37 KB | fenstrat |
| #1 | 1212942-1-hook_requirements.patch | 1.57 KB | fenstrat |
Comments
Comment #1
fenstratAttached patch clears up the hook_requirements to display a standard "Glip Library - Exists" message if present, but keeps the same error if it is not present.
Comment #2
_-. commentedcd ./sites/all/modules
drush -y pm-disable git_deploy
rm -rf git_deploy
git clone --branch master http://git.drupal.org/project/git_deploy.git
drush -y pm-enable git_deploy
...
Glip has been cloned via git to /srv/www/d7t3/sites/all/libraries/glip/glip
...
ls -al ./sites/all/libraries/glip
total 12
drwxr-xr-x 3 wwwrun www 4096 Jul 9 10:30 ./
drwxr-xr-x 7 wwwrun www 4096 Jul 9 10:30 ../
drwxr-xr-x 5 wwwrun www 4096 Jul 9 10:30 glip/
ls -al ./sites/all/libraries/glip/glip
total 120
drwxr-xr-x 5 wwwrun www 4096 Jul 9 10:30 ./
drwxr-xr-x 3 wwwrun www 4096 Jul 9 10:30 ../
drwxr-xr-x 2 wwwrun www 4096 Jul 9 10:30 doc/
-rw-r--r-- 1 wwwrun www 63840 Jul 9 10:30 Doxyfile
drwxr-xr-x 8 wwwrun www 4096 Jul 9 10:30 .git/
-rw-r--r-- 1 wwwrun www 9 Jul 9 10:30 .gitignore
-rw-r--r-- 1 wwwrun www 743 Jul 9 10:30 HACKING
drwxr-xr-x 2 wwwrun www 4096 Jul 9 10:30 lib/
-rw-r--r-- 1 wwwrun www 17987 Jul 9 10:30 LICENSE
-rw-r--r-- 1 wwwrun www 575 Jul 9 10:30 README
@ http://www.mysite.com/admin/reports/status
Glip Library See the instructions in sites/all/modules/git_deploy/README.txt
The Glip library must be present to use git_deploy.
OK
shouldn't glip be cloned into:
/srv/www/d7t3/sites/all/libraries/glip
not
/srv/www/d7t3/sites/all/libraries/glip/glip ?
Comment #3
_-. commentedalso, if i
cd /srv/www/d7t3/sites/all/libraries
mv glip glipTOP
mv glipTOP/glip .
then, @ status report
Glip Library See the instructions in sites/all/modules/git_deploy/README.txt
The Glip library must be present to use git_deploy.
again, in 'Green' (i.e. REQUIREMENT_OK) .
Comment #4
fenstrat@x746554 You've found yet another issue, it should indeed be cloned to /site/all/libraries/glip not /site/all/libraries/glip/glip. I've spun that off into #1214494: Incorrect Glip clone location with Libraries in drush_git_deploy_download()
Also, your status report in green noted in #3 should not happen if the patch here in #1 was applied. Can you confirm it that you have the patch in #1 applied?
Comment #5
Freso commented@fenstrat: It's great with all your help here in the queue. Although we're slow, it is greatly appreciated. :)
$value = t('Exists');should probably either be more specific (e.g., "Glip library exists") or provide context.Also, just because I can't help picking those nits: in future patches, I'd like to see non-related Doxygen fixes left out, so it's just the fix itself in the patch. Feel free to open a new issue for fixing/improving Doxygen though. :) (I'm talking about the @file block here, the "..._requirements()" is fine, as that actually relates to cleaning it up.)
Apart from the two (minor) points above, the code looks sound, so if those are nailed and someone chimes in and can confirm that what I'm reading is what is happening, this should be good to go. (It's a hard to review patches properly without a development system to test on. :/)
Comment #6
_-. commentedAh, my mistake ... patch posted, but not committed to git. Sry.
short story, applying both patches to latest git tree, i still am seeing an issue at 'drush up' :-/
details:
@ nav to: http://.../admin/reports/status
now correctly displays: "Glip Library Exists"
checking drush mgmt, e.g.,
but, at
which is drush incorrectly (?) ignoring the git-deployed "git-deploy" and "memcache" modules, and trying to actually DOWNgrade them.
at this point, i'm unsure if git-deploy, drush, or my config/understanding is not quite right.
Comment #7
Freso commentedThose last issues are more than likely not at all related to this issue here. Try looking at #1007890: Add support for annotated tags or #1011170: When a user is working from a local branch, display the release it was branched from, it sounds like your issue is more along those lines.
Comment #8
fenstrat@Freso, no worries, glad to be of assistance, also glad to see some feedback!
Attached patch addresses your review in #5:
1) I've left the
$value = t('Exists');because this is the way both core and contrib do this, e.g. "Protected" and "Exists" - they don't make sense out of context, but on the status page with their title they become "Access to update.php - Protected" and "CTools CSS Cache - Exists".2) I've removed the file Doxygen, it is indeed out of context, will follow up in another issue.
The feedback in #6 "now correctly displays: 'Glip Library Exists'" suggests this patch is working for x746554
@x746554, the issues you're seeing indeed look like they're not related to this issue. Also, it appears you're using the patch in #1214494: Incorrect Glip clone location with Libraries in drush_git_deploy_download(), can you mark that as RTBC if that's the case.
Comment #9
fenstratNo time atm, but this needs to be integrated with sun's approach in #1215372: Requirements check fails on Drupal installation
Comment #10
adammaloneI've had a quick stab at conglomerating both the patch by fenstrat and 'sun's approach'.
Comment #11
fenstrat@typhonius The 7.x-2.x branch is a total rewrite from the groud up by chx, pretty sure the 1.x branch is not getting any further development?
Comment #12
Freso commentedActually, The -2.x of both 6.x and 7.x is using an approach that required the "git" binary to be available for use on the webserver. And while the -2.x branches will receive the most love, good patches are still accepted for the -1.x branches, as those should work even on systems without the "git" binary (though obviously more limited - and with more dependencies).
(If we weren't accepting any patches for -1.x, the issues pertaining to these versions would be "won't fix"'ed. ;))
@typhonius:
By "sun's approach", you mean removing the fall-back of having the Glip library installed as a subdirectory of git_deploy? I think my personal taste would be for having the two patches done separately. Feel free to reopen and move #1215372: Requirements check fails on Drupal installation to 7.x-1.x and change status to "patch (to be ported)" (unless you port it immediately, of course :)).
Comment #13
adammaloneOk sounds good. I'll split the patch up into one for this issue and a 7.x version port for the other issue.
Attached is the patch for this issue.
Comment #15
darren oh