[ome-devel] "pre-Beta" LDAP patch

[McCaughey, Michael J]

Hmm...
I just grabbed the rc3 release:
curl http://cvs.openmicroscopy.org.uk/snapshots/ome-2.6.0-rc3.tar.gz > ome-2.6.0-rc3.tar.gz

and applied the patch:
 patch -p0 <OME_2_6_0_ldap.patch

patching file OME/install.pl
patching file OME/src/perl2/OME/Install/CoreDatabaseTablesTask.pm
Hunk #1 succeeded at 801 (offset 3 lines).
Hunk #3 succeeded at 863 (offset 3 lines).
patching file OME/src/perl2/OME/Install/Environment.pm
patching file OME/src/perl2/OME/Install/LDAPConfigTask.pm
patching file OME/src/perl2/OME/Install/PerlModuleTask.pm
Hunk #1 succeeded at 428 (offset 4 lines).
Hunk #2 succeeded at 477 (offset 2 lines).
Hunk #3 succeeded at 499 (offset 4 lines).
Hunk #4 succeeded at 734 (offset 11 lines).
patching file OME/src/perl2/OME/SessionManager.pm
Hunk #2 FAILED at 85.
Hunk #3 succeeded at 316 (offset 3 lines).
Hunk #5 succeeded at 514 (offset 82 lines).
Hunk #7 succeeded at 532 (offset 82 lines).
Hunk #9 succeeded at 613 (offset 81 lines).
1 out of 9 hunks FAILED -- saving rejects to file OME/src/perl2/OME/SessionManager.pm.rej
patching file OME/src/perl2/OME/Util/Ldap.pm

I have one error with rc3:

[mrmike at cisrdev OME_2_6_rc3]$ more OME/src/perl2/OME/SessionManager.pm.rej

***************
*** 84,89 ****
  use OME::Configuration;
  use Term::ReadKey;
  use OME::DBObject;

  use base qw(Class::Accessor Class::Data::Inheritable);

--- 85,91 ----
  use OME::Configuration;
  use Term::ReadKey;
  use OME::DBObject;
+ use OME::Util::Ldap;

  use base qw(Class::Accessor Class::Data::Inheritable);


I don't see why this is an error, but you could manually add the line:
use OME::Util::Ldap;
to SessionManager.pm and give it a whirl.

I'll take a look at what's up with the patch later this weekend.


Michael J. McCaughey, PhD
Molecular Physiology and Biophysics
U9203 MRBIII
6-6175



-----Original Message-----
From: ome-devel-bounces at lists.openmicroscopy.org.uk on behalf of Zhou, Mi
Sent: Fri 8/25/2006 4:26 PM
To: ome-devel at lists.openmicroscopy.org.uk
Subject: [ome-devel]  "pre-Beta" LDAP patch
 
Hi,

Thank you very much for your effort in making OME "LDAP" friendly. 
I am trying to apply the patch to 2.6.0-rc3 and 2.6.0-rc1, but many
hunks failed on both of them. Probably you run diff against some other
release?

Thanks,

Mi Zhou
St. Jude Childrent's Research Hospital


_______________________________________________
ome-devel mailing list
ome-devel at lists.openmicroscopy.org.uk
http://lists.openmicroscopy.org.uk/mailman/listinfo/ome-devel

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmicroscopy.org.uk/pipermail/ome-devel/attachments/20060826/db680967/attachment.htm