Skip to content

Instantly share code, notes, and snippets.

@glennpratt
Created December 8, 2011 17:12
Show Gist options
  • Select an option

  • Save glennpratt/1447659 to your computer and use it in GitHub Desktop.

Select an option

Save glennpratt/1447659 to your computer and use it in GitHub Desktop.
root@mercury:/mnt/apci/main/bin/drush# git show HEAD
commit a901da7c85940720c1d524b2eccc84300a74901d
Author: Christopher Gervais <chris@ergonlogic.com>
Date: Mon Sep 12 09:19:26 2011 -0400
Issue #1214216 by ergonlogic: Use per-user directory (/home/ergonlogic/.drush) instead of global directory when latter is not writable
diff --git a/commands/pm/pm.drush.inc b/commands/pm/pm.drush.inc
index 8a9573c..a564881 100644
--- a/commands/pm/pm.drush.inc
+++ b/commands/pm/pm.drush.inc
@@ -2312,7 +2312,7 @@ function pm_drush_pm_download_destination_alter(&$project, $release) {
$drush_command_files = drush_scan_directory($project['full_project_path'], '/.*\.drush.inc/');
if (!empty($drush_command_files)) {
$install_dir = drush_get_context('SHARE_PREFIX', '/usr') . '/share/drush/commands';
- if (!is_dir($install_dir)) {
+ if (!is_dir($install_dir) || !is_writable($install_dir)) {
$install_dir = drush_server_home() . '/.drush';
}
// Make the .drush dir if it does not already exist.
root@mercury:/mnt/apci/main/bin/drush# drush --version
drush version 4.6-dev
root@mercury:/mnt/apci/main/bin/drush#
gpratt@a:~$ which drush
/usr/local/bin/drush
gpratt@a:~$ ls -al /usr/local/bin/drush
lrwxrwxrwx 1 root root 22 2011-12-08 10:59 /usr/local/bin/drush -> /usr/local/drush/drush
gpratt@a:~$ cd /usr/local/drush
gpratt@a:/usr/local/drush$ git status
# On branch master
nothing to commit (working directory clean)
gpratt@a:/usr/local/drush$ git show HEAD
commit 5e60d6a94c5c55408c683d73c9c99e237bb1017c
Author: Jonathan Araña Cruz <jonhattan@faita.net>
Date: Thu Dec 8 10:41:15 2011 +0000
Issue #1364464: Call to undefined function _drush_pm_get_releases()
diff --git a/commands/pm/release_info/updatexml.inc b/commands/pm/release_info/updatexml.inc
index ae3a218..d98a720 100644
--- a/commands/pm/release_info/updatexml.inc
+++ b/commands/pm/release_info/updatexml.inc
@@ -188,7 +188,7 @@ function release_info_print_releasenotes($requests, $print_status = TRUE, $tmpfi
unset($node_content[0]->div);
$project_notes = $node_content[0]->asXML();
- // Build the status message from the info from _drush_pm_get_releases
+ // Build the status message from the info from release_info_get_releases()
$status_msg = '> ' . implode(', ', $project['releases'][$version]['release_status']);
$break = '<br>';
$notes_header = dt("<hr>
diff --git a/includes/drush.inc b/includes/drush.inc
index bb24d6d..40de086 100644
--- a/includes/drush.inc
+++ b/includes/drush.inc
@@ -190,7 +190,7 @@ function drush_check_self_update() {
$is_dev = FALSE;
// Get release info for drush
- $info = _drush_pm_get_releases(array('drush'));
+ $info = release_info_get_releases(array('drush'));
// Check for newer releases based on the datestamp.
// We add 60 seconds to the drush.info date because of a drupal.org WTF. See http://drupal.org/node/1019356.
$version_date = $drush_info['datestamp'] + 60;
gpratt@a:/usr/local/drush$
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment