OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 07-Aug-2009 22:20:55
Branch: HEAD Handle: 2009080721205500
Modified files:
openpkg-src/monotone monotone.patch.rse monotone.spec
Log:
fix .mtn/update file path
Summary:
Revision Changes Path
1.17 +19 -8 openpkg-src/monotone/monotone.patch.rse
1.47 +1 -1 openpkg-src/monotone/monotone.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.patch.rse
============================================================================
$ cvs diff -u -r1.16 -r1.17 monotone.patch.rse
--- openpkg-src/monotone/monotone.patch.rse 24 Jul 2009 21:24:15 -0000
1.16
+++ openpkg-src/monotone/monotone.patch.rse 7 Aug 2009 20:20:55 -0000
1.17
@@ -1034,8 +1034,8 @@
===================================================================
Index: work.cc
--- work.cc c51fba22fdcce8d71385eb0aded4c4df512eb640
-+++ work.cc 39ce8f6d62e86aa3309b60095dc0a3540d3eb697
-@@ -58,35 +58,55 @@ get_revision_path(bookkeeping_path & m_p
++++ work.cc 85beba2a5a072ff41ba19007eefb29a1e5303460
+@@ -58,42 +58,66 @@ get_revision_path(bookkeeping_path & m_p
static void
get_revision_path(bookkeeping_path & m_path)
{
@@ -1091,7 +1091,18 @@
L(FL("user log path is %s") % ul_path);
}
-@@ -104,7 +124,11 @@ directory_is_workspace(system_path const
+ static void
+ get_update_path(bookkeeping_path & update_path)
+ {
++#if defined(RSE) /* alt-book-keeping-root */
++ update_path = (directory_exists(alt_bookkeeping_root) ?
alt_bookkeeping_root : bookkeeping_root) / update_file_name;
++#else
+ update_path = bookkeeping_root / update_file_name;
++#endif
+ L(FL("update path is %s") % update_path);
+ }
+
+@@ -104,7 +128,11 @@ directory_is_workspace(system_path const
{
// as far as the users of this function are concerned, a version 0
// workspace (MT directory instead of _MTN) does not count.
@@ -1103,7 +1114,7 @@
}
bool workspace::found;
-@@ -137,13 +161,24 @@ workspace::create_workspace(options cons
+@@ -137,13 +165,24 @@ workspace::create_workspace(options cons
go_to_workspace(new_dir);
mark_std_paths_used();
@@ -1128,7 +1139,7 @@
mkdir_p(bookkeeping_root);
workspace::found = true;
-@@ -522,9 +557,16 @@ workspace::get_database_option(system_pa
+@@ -522,9 +561,16 @@ workspace::get_database_option(system_pa
rsa_keypair_id workspace_key;
system_path workspace_keydir;
@@ -1145,7 +1156,7 @@
read_options_file(o_path,
workspace_database, workspace_branch,
workspace_key, workspace_keydir);
-@@ -606,7 +648,11 @@ workspace::get_local_dump_path(bookkeepi
+@@ -606,7 +652,11 @@ workspace::get_local_dump_path(bookkeepi
{
E(workspace::found, origin::user, F("workspace required but not found"));
@@ -1157,7 +1168,7 @@
L(FL("local dump path is %s") % d_path);
}
-@@ -1015,7 +1061,11 @@ path_for_detached_nids()
+@@ -1015,7 +1065,11 @@ path_for_detached_nids()
static inline bookkeeping_path
path_for_detached_nids()
{
@@ -1169,7 +1180,7 @@
}
static inline bookkeeping_path
-@@ -1761,9 +1811,15 @@ workspace::perform_pivot_root(database &
+@@ -1761,9 +1815,15 @@ workspace::perform_pivot_root(database &
E(is_dir_t(old_roster.get_node(new_root)), origin::user,
F("proposed new root directory '%s' is not a directory") % new_root);
{
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/monotone/monotone.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 monotone.spec
--- openpkg-src/monotone/monotone.spec 24 Jul 2009 21:24:15 -0000
1.46
+++ openpkg-src/monotone/monotone.spec 7 Aug 2009 20:20:55 -0000
1.47
@@ -32,7 +32,7 @@
Group: SCM
License: GPL
Version: 0.44
-Release: 20090724
+Release: 20090807
# package options
%option with_rse yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
