Index: drush_make.download.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush_make/Attic/drush_make.download.inc,v
retrieving revision 1.1.2.96
diff -u -p -r1.1.2.96 drush_make.download.inc
--- drush_make.download.inc	25 Oct 2010 05:37:14 -0000	1.1.2.96
+++ drush_make.download.inc	1 Nov 2010 12:00:55 -0000
@@ -13,7 +13,7 @@ function drush_make_download_factory($na
 
 function drush_make_download_cvs($name, $download, $download_location) {
   if (!empty($download['module'])) {
-    if (drush_get_option('working-copy')) {
+    if (_drush_make_checkout_is_working_copy($download)) {
       if ($download['module'] == 'drupal') {
         $download['root'] = ":pserver:anonymous:anonymous@drupalcode.org:/cvs/drupal";
       }
@@ -35,7 +35,7 @@ function drush_make_download_cvs($name, 
     $cd_to_directory = dirname($download_location);
     $destination_directory = basename($download_location);
   
-    $command = 'cvs -d%s ' . (drush_get_option('working-copy') ? 'checkout' : 'export') . ' -d%s';
+    $command = 'cvs -d%s ' . ((_drush_make_checkout_is_working_copy($download)) ? 'checkout' : 'export') . ' -d%s';
     $args = array($download['root'], $destination_directory);
     if (isset($download['revision'])) {
       $command .= ' -r %s';
@@ -391,7 +391,9 @@ function drush_make_download_post($name,
 
 function drush_make_download_git($name, $download, $download_location) {
   $tmp_path = drush_make_tmp();
-  $wc = drush_get_option('working-copy');
+  
+  // if working copy option is set either on the commandline or in the project options, we won't clean up version control files
+    $wc = _drush_make_checkout_is_working_copy($download);
 
   // check if branch option is set in info file, otherwise set default to master branch
   $download['branch'] = isset($download['branch']) ? $download['branch'] : 'master';
@@ -553,7 +555,7 @@ function drush_make_download_bzr($name, 
   if (!empty($download['url'])) {
     $args = array();
     $command = 'bzr';
-    if (drush_get_option('working-copy')) {
+    if (_drush_make_checkout_is_working_copy($download)) {
       $command .= ' branch  --use-existing-dir';
     }
     else {
@@ -564,7 +566,7 @@ function drush_make_download_bzr($name, 
       $args[] = $download['revision'];
     }
     $command .= ' %s %s';
-    if (drush_get_option('working-copy')) {
+    if (_drush_make_checkout_is_working_copy($download)) {
       $args[] = $download['url'];
       $args[] = $tmp_location;
     }
@@ -599,7 +601,7 @@ function drush_make_download_svn($name, 
       $options = '--force --non-interactive';
       $function = 'drush_shell_exec';
     }
-    if (drush_get_option('working-copy')) {
+    if (_drush_make_checkout_is_working_copy($download)) {
       $command = 'svn ' . $options . ' checkout';
     }
     else {
@@ -654,3 +656,8 @@ function _drush_make_verify_checksum($pa
   }
   return TRUE;
 }
+
+// if working copy option is set either on the commandline or in the project download options, we won't clean up version control files
+function _drush_make_checkout_is_working_copy($download) {
+    return $download['working-copy'] || drush_get_option('working-copy');
+}