[Monotone-commits-diffs] org.debian.monotone: 3d228287f8a645bcab719ac898cdd29eac092f10

[code]

revision:            3d228287f8a645bcab719ac898cdd29eac092f10
date:                2010-08-01T02:25:50
author:              Francis Russell <address@hidden>
branch:              org.debian.monotone
changelog:
Apply upstream patch to fix FTBFS. A unit test assumed that it was always
impossible to migrate a monotone database located inside an unwritable
directory. This is no longer true with SQLite 3.7.

manifest:
format_version "1"

new_manifest [dee3cd0eefb94cee3a3a6fcbbcfefc00d4ef6d3d]

old_revision [df2404f67f80cb2a505aad145e697982f52c203b]

add_file "patches/00-fail_cleanly_on_unreadable_db.diff"
 content [ef03fafa904ae94e146ff33b0692bdd1bccf449e]

patch "changelog"
 from [a8614bee64461c472e9e2e4772f79e608c2f02b6]
   to [c111693325be8ac0d2b1ff7315c7b5ad1da138a0]

patch "patches/series"
 from [a9cedff979e581682473c4fbc9cc727893cfaa9a]
   to [8bec750bce1e1dc66bb0b390532a900f9ba11e8f]
============================================================
--- changelog	a8614bee64461c472e9e2e4772f79e608c2f02b6
+++ changelog	c111693325be8ac0d2b1ff7315c7b5ad1da138a0
@@ -1,9 +1,13 @@ monotone (0.48-2) UNRELEASED; urgency=lo
 monotone (0.48-2) UNRELEASED; urgency=low
 
   * Add myself to list of uploaders.
-  * Update to standards version 3.9.0 (no changes required). 
+  * Update to standards version 3.9.0 (no changes required).
+  * Apply upstream patch to fix FTBFS. A unit test
+    assumed that it was always impossible to migrate a monotone database located
+    inside an unwritable directory. This is no longer true with SQLite 3.7
+    (closes: #591112).
 
- -- Francis Russell <address@hidden>  Sat, 17 Jul 2010 19:08:25 +0100
+ -- Francis Russell <address@hidden>  Sun, 01 Aug 2010 02:41:40 +0100
 
 monotone (0.48-1) unstable; urgency=low
 
============================================================
--- /dev/null	
+++ patches/00-fail_cleanly_on_unreadable_db.diff	ef03fafa904ae94e146ff33b0692bdd1bccf449e
@@ -0,0 +1,17 @@
+From upstream changelog for revision 78f4db157a353de19b33df875959efc2492812b4:
+  SQLite 3.7 is less eager about creting journal files; in particular a
+  do-nothing 'db migrate' doesn't create one. So don't require that
+  'db migrate' fail if the database directory isn't writeable.
+
+Index: monotone-0.48/tests/fail_cleanly_on_unreadable_db/__driver__.lua
+===================================================================
+--- monotone-0.48.orig/tests/fail_cleanly_on_unreadable_db/__driver__.lua	2010-08-01 02:38:13.994830204 +0100
++++ monotone-0.48/tests/fail_cleanly_on_unreadable_db/__driver__.lua	2010-08-01 02:38:52.708854534 +0100
+@@ -48,7 +48,6 @@
+ check(mtn("--db=subdir/foo.db", "ls", "branches"), 0, false, false)
+ check(mtn("--db=subdir/foo.db", "db", "info"), 0, false, false)
+ check(mtn("--db=subdir/foo.db", "db", "version"), 0, false, false)
+-check(mtn("--db=subdir/foo.db", "db", "migrate"), 1, false, false)
+ check(mtn("--db=subdir/bar.db", "db", "load"), 1, false, false)
+ check(mtn("--db=subdir/baz.db", "db", "init"), 1, false, false)
+ check({"chmod", "a+w", "subdir"})
============================================================
--- patches/series	a9cedff979e581682473c4fbc9cc727893cfaa9a
+++ patches/series	8bec750bce1e1dc66bb0b390532a900f9ba11e8f
@@ -1 +1,2 @@
+00-fail_cleanly_on_unreadable_db.diff
 90-stacktrace-on-crash.diff