Revision
462
Author
wsiegrist@apple.com
Date
2009-01-14 14:25:01 -0800 (Wed, 14 Jan 2009)

Log Message

Merging PR-6493844

Modified Paths

Property Changed

Diff

Property changes: trunk

Modified: svn:mergeinfo

/branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /trunk:432-434 + /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /branches/PR-6493844:460-461 /trunk:432-434

Property changes: trunk/darwinbuild/darwinbuild.in

Modified: svn:mergeinfo

/branches/PR-6358021/darwinbuild/darwinbuild:442-443 /branches/PR-6392966/darwinbuild/darwinbuild:423-427 /branches/PR-6398060/darwinbuild/darwinbuild:433-434 /trunk/darwinbuild/darwinbuild:432-434 + /branches/PR-4841388/darwinbuild/darwinbuild:399-419 /branches/PR-6358021/darwinbuild/darwinbuild:442-443 /branches/PR-6392966/darwinbuild/darwinbuild:423-427 /branches/PR-6398060/darwinbuild/darwinbuild:433-434 /branches/PR-6493844/darwinbuild/darwinbuild.in:460-461 /trunk/darwinbuild/darwinbuild:432-434

Property changes: trunk/darwinbuild/darwinmaster.sh.in

Modified: svn:mergeinfo

/branches/PR-6358021/darwinbuild/darwinmaster.sh:442-443 /branches/PR-6392966/darwinbuild/darwinmaster.sh:423-427 /branches/PR-6398060/darwinbuild/darwinmaster.sh:433-434 /trunk/darwinbuild/darwinmaster.sh:432-434 + /branches/PR-4841388/darwinbuild/darwinmaster.sh:399-419 /branches/PR-6358021/darwinbuild/darwinmaster.sh:442-443 /branches/PR-6392966/darwinbuild/darwinmaster.sh:423-427 /branches/PR-6398060/darwinbuild/darwinmaster.sh:433-434 /branches/PR-6493844/darwinbuild/darwinmaster.sh.in:460-461 /trunk/darwinbuild/darwinmaster.sh:432-434

Property changes: trunk/darwinbuild/installXcode.in

Modified: svn:mergeinfo

/branches/PR-6358021/darwinbuild/installXcode:442-443 /branches/PR-6392966/darwinbuild/installXcode:423-427 /branches/PR-6398060/darwinbuild/installXcode:433-434 /trunk/darwinbuild/installXcode:432-434 + /branches/PR-4841388/darwinbuild/installXcode:399-419 /branches/PR-6358021/darwinbuild/installXcode:442-443 /branches/PR-6392966/darwinbuild/installXcode:423-427 /branches/PR-6398060/darwinbuild/installXcode:433-434 /branches/PR-6493844/darwinbuild/installXcode.in:460-461 /trunk/darwinbuild/installXcode:432-434

Property changes: trunk/darwinbuild/packageRoots.sh.in

Modified: svn:mergeinfo

/branches/PR-6358021/darwinbuild/packageRoots.sh:442-443 /branches/PR-6392966/darwinbuild/packageRoots.sh:423-427 /branches/PR-6398060/darwinbuild/packageRoots.sh:433-434 /trunk/darwinbuild/packageRoots.sh:432-434 + /branches/PR-4841388/darwinbuild/packageRoots.sh:399-419 /branches/PR-6358021/darwinbuild/packageRoots.sh:442-443 /branches/PR-6392966/darwinbuild/packageRoots.sh:423-427 /branches/PR-6398060/darwinbuild/packageRoots.sh:433-434 /branches/PR-6493844/darwinbuild/packageRoots.sh.in:460-461 /trunk/darwinbuild/packageRoots.sh:432-434

Property changes: trunk/darwinbuild/thinPackages.sh.in

Modified: svn:mergeinfo

/branches/PR-6358021/darwinbuild/thinPackages.sh:442-443 /branches/PR-6392966/darwinbuild/thinPackages.sh:423-427 /branches/PR-6398060/darwinbuild/thinPackages.sh:433-434 /trunk/darwinbuild/thinPackages.sh:432-434 + /branches/PR-4841388/darwinbuild/thinPackages.sh:399-419 /branches/PR-6358021/darwinbuild/thinPackages.sh:442-443 /branches/PR-6392966/darwinbuild/thinPackages.sh:423-427 /branches/PR-6398060/darwinbuild/thinPackages.sh:433-434 /branches/PR-6493844/darwinbuild/thinPackages.sh.in:460-461 /trunk/darwinbuild/thinPackages.sh:432-434

Modified: trunk/darwinup/Depot.cpp (461 => 462)


--- trunk/darwinup/Depot.cpp	2009-01-14 00:07:16 UTC (rev 461)
+++ trunk/darwinup/Depot.cpp	2009-01-14 22:25:01 UTC (rev 462)
@@ -50,6 +50,8 @@
 }
 
 Depot::Depot(const char* prefix) {
+	m_lock_fd = -1;
+
 	asprintf(&m_depot_path,    "%s/.DarwinDepot",  prefix);
 	asprintf(&m_database_path, "%s/Database-V100", m_depot_path);
 	asprintf(&m_archives_path, "%s/Archives",      m_depot_path);