I created a test make file with the code copied directly from the example.make file along with a new module:

core = 6.x

projects[drupal][type] = "core"
projects[drupal][download][type] = "cvs"
projects[drupal][download][root] = ":pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal"
projects[drupal][download][module] = "drupal"
projects[drupal][download][revision] = "DRUPAL-6"

projects[admin_menu][download][type] = "cvs"
projects[admin_menu][download][root] = ":pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal-contrib"
projects[admin_menu][download][module] = "contributions/modules/admin_menu"
projects[admin_menu][download][revision] = "DRUPAL-6--3"

No matter what I do it doesn't appear as if the installation is checked out from cvs. There's no CVS metadata folder at either the core or module level, cvs update doesn't work (i get the cvs [update aborted]: there is no version here; run 'cvs checkout' first message), and admin/reports/updates shows the versions correctly without cvs_deploy.

I'm using the latest devs of both drush and drush_make and attached is a run of the file with --debug.

Any insights would be greatly appreciated.

CommentFileSizeAuthor
#12 drush_make_cvsroot_840802_12.patch943 bytesWorldFallz
#8 drush_make_840802.patch1.56 KBWorldFallz
#6 cvs.patch1.51 KBdmitrig01
#2 debug2.txt4.89 KBWorldFallz
debug.txt30.53 KBWorldFallz
debug.txt30.53 KBWorldFallz

Comments

yhahn’s picture

yhahn commented
Status: Active » Postponed (maintainer needs more info)

Have you tried with the --working-copy flag?

WorldFallz’s picture

WorldFallz commented
StatusFileSize
new debug2.txt4.89 KB

that got me further-- the admin_menu module is checked out to sites/all/modules but there are no other core files and folders. Attached is the new debug file-- its like drush isn't seeing the projects[drupal][download][root] = ":pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal" line.

WorldFallz’s picture

WorldFallz commented
Status: Postponed (maintainer needs more info) » Active
WorldFallz’s picture

WorldFallz commented

ok. i've figured where the problem is, but not how to fix it.

it works either when I have no environment cvsroot specified or when it's set to the /cvs/drupal cvs root but not when set to the /cvs/drupal-contrib cvs root. Seems there's an issue with processing the environment cvsroot for core downloads.

yhahn’s picture

yhahn commented

Thanks for tracking this down - will look into it when I get the chance.

dmitrig01’s picture

dmitrig01 commented
Status: Active » Needs review
StatusFileSize
new cvs.patch1.51 KB

Try this

WorldFallz’s picture

WorldFallz commented
Status: Needs review » Active

Nope-- that still installs everything as non cvs copies.

Shouldn't this code

if (drush_get_option('working-copy')) {
  $command = 'checkout';
}

be something like:

if ($this->project->download['type'] == 'cvs') {
  $command = 'checkout';
}
WorldFallz’s picture

WorldFallz commented
Status: Active » Needs review
StatusFileSize
new drush_make_840802.patch1.56 KB

Yep... that seems to do it:

dmitrig01’s picture

dmitrig01 commented

I disagree with this aprt:

-      if (drush_get_option('working-copy')) {
+      if ($this->project->download['type'] == 'cvs') {
WorldFallz’s picture

WorldFallz commented

I'm not sure what exactly 'working-copy' is supposed to trigger, but without the change, the first patch doesn't work. Nothing is checked out from cvs, it's just a regular download.

dmitrig01’s picture

dmitrig01 commented
Status: Needs review » Needs work

--working-copy means it has the CVS directory, whereas if you leave it out, there's no CVS directory (using cvs export)

WorldFallz’s picture

WorldFallz commented
Title: can't cvs checkout working » can't cvs checkout working with core
Status: Needs work » Needs review
StatusFileSize
new drush_make_cvsroot_840802_12.patch943 bytes

OK, the most recent version seems to be working properly for contrib with --working-copy.

However, core still won't checkout and I don't see how it ever would if my CVSROOT is set and set to cvs.drupal.org:/cvs/drupal-contrib the code will leave it alone and checkout of core from drupal-contrib will, obviously fail. The logic for determining what to do about cvsroot needs to take into account projects[drupal][type] = "core" always means cvs.drupal.org:/cvs/drupal.

Something like the attached maybe? I don't have the ability to test it atm but I will when I get a chance tomorrow.

WorldFallz’s picture

WorldFallz commented

yep, patch in #12 works regardless of what my cvsroot is set to.

naxoc’s picture

naxoc commented
Status: Needs review » Reviewed & tested by the community

The patch in #12 makes it work for me too with both core and contrib stuff in cvs in the makefile. Setting to reviewed.

dmitrig01’s picture

dmitrig01 commented
Status: Reviewed & tested by the community » Fixed

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.

mrfelton’s picture

mrfelton commented

Subscribing/Bookmarking, since this is not yet in the latest release, and I can't pull Drupal 7 properly without it.