← Back to team overview

instant team mailing list archive

[MERGE] One can now overrule the default instant cache directory,

 

Hello!

I am trying the 

  bzr send 

command to send a patch with commits. 

The handed patch should add a check for the environmental variable 
INSTANT_CACHE_DIR, when setting the default directory for the instant cache.

Johan
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: johan.hake@xxxxxxxxx-20091124231837-czdvqet6hukvoh2m
# target_branch: bzr+ssh://bazaar.launchpad.net/~instant-\
#   core/instant/main/
# testament_sha1: 708c18770ab22e9888e8a5c5eaf234fb32946cbe
# timestamp: 2009-11-24 15:25:13 -0800
# base_revision_id: gnw20@xxxxxxxxx-20091124111036-6g0x70024f5gm9m4
# 
# Begin patch
=== modified file '.bzrignore'
--- .bzrignore	2009-11-24 11:10:36 +0000
+++ .bzrignore	2009-11-24 23:17:58 +0000
@@ -1,3 +1,2 @@
-(^|/)\.svn($|/)
-(^|/)\.hg($|/)
-(^|/)\.hgtags($|/)
+build
+tests/**/

=== modified file 'src/instant/paths.py'
--- src/instant/paths.py	2008-10-20 12:12:00 +0000
+++ src/instant/paths.py	2009-11-24 23:18:37 +0000
@@ -41,7 +41,10 @@
 
 def get_default_cache_dir():
     "Return the default cache directory."
-    cache_dir = os.path.join(get_instant_dir(), "cache")
+    if "INSTANT_CACHE_DIR" in os.environ:
+        cache_dir = os.environ["INSTANT_CACHE_DIR"]
+    else:
+        cache_dir = os.path.join(get_instant_dir(), "cache")
     if not os.path.isdir(cache_dir):
         instant_debug("Creating cache directory '%s'." % cache_dir)
         os.mkdir(cache_dir)

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfvSDiwAAtjfgEQQVHf/935z
nAq////wUAW2b1AAPWqioAAJSajTST1PRMwU08U8p5T1PUaZAAAABEk9Tyj09SZGgyZNNGgGRiaa
A00ZDINTU2plGmRpoAMg0AAA0GmmgBGlQ/VAxHqDTTTQAAyGgNGjTTIAkkEyABGIJkRinoyGoaAA
BoUAUvNETSmnXSZmDGyZgsI5AVOANLisJxMQCepzWkCciaH1vsiYrisCDlAkALQIkhw7YibJBEHe
oCpSZBTzrsG8bApKNNAU0NCGV1xQRIZfQmq8ppgNDKPhmEBchTfLcOerxlWGHzmTDB1TtAjW1+j+
28qAySZZc2vk2aMcNzJETvFLjsDJJdxJcA2l7RZjiCP5KjNBpbTTCwN/YgLqzKgE8fu+FQbq99BL
XtSyKq7mDgLEmXVODEBJxo0N5SDyiQBkMS4o8X0OGAXHzuKxeckVI12HVlRE+u4d5B5yzEOppvL8
6QrJ9Qy6mtAZhIBWPRQSLsdxFIGtH5ww30FFX3KsZwv7LDOeiCo8a3i77UVvcFZgZf0YlZga6aI3
62bIE/kcEfAOeWc1caleSS23WyBDAxmi2lBngQ10NdMkVJWWct7zcZ1d4oZ5biusikr7aC8fRJjf
KYY8X5Csk+WC3QOMh91mVUqWFUEGSUbGfK64UGwLZ8gvwhYFIdAkGFk1TgygO3mOFF03PQUmITfT
BFIsNol9IQRNGZtBial1QX5UV03A/aaDIwSxg4yqKrg7hQLKxZf8FekQ2qvfJBpEvcgrkUB5GJiL
HWM+eNsXbWQGQXvI2xSuHGlRoSLiV5SUWbWc0YXkgFSi66A+dMatphYDzKd5oYsXcQrQcZ11UDla
n1lJAmVmQOYmSRF5AHDhMSGiEUqJDHqGwVz5DjR7FzMz26HkYlwRQGf5L1VpBjIGRsaZRCDEabYh
PpiGkSiWiGUpDjFULLoiBSpAkqserdnyWIZHEZojnMl8/J4a+5DwPacX+bup7j2HA7+MsPVzhgak
OvJJIdKJigHAYzIBRmy0xg8PkUBBkA5BUQS1LhH0tBwMV/KPqOOD/R/FzfijaijiNUu8om+0IFUc
hzzzJARx0jxvx383yfYP3xDGH9YcMhMfPRAakni8XaYG3ealxw28NryjFHM4FYnkRJNDiDNM3stD
Yj+Qs4xKO0y4o8MY9i8MKnyg3S/t8vKypWtG+Nc4623klGSIBHaHKKTEhnRFWhAgiLjju03QXXlJ
p0qZynTWNnmHZ1N6r6Hg+9AQ7BFEtLtaF/XI7Z+BT3lYUZi7ogPFAjfoZXGZqGhD28pzlKwaEqkQ
fhUUFTELAWsMUD4wJQ1oBEEIXm3gL0Q/tA9iAgkEYMMFHx+r7YrAWYuQz12ljbj4nwExE8uQUd5x
4oDf2CmFkTe/0SvjHNtcNDn2DiZMDEPJdGA8SB6eiOwvGqBhwzqy7XpoDGoIySh9ERFDtQHQC8C8
cBCMfkw5gqhvIHDcgnGFJ0R3hzSUQd9QdQgMgN+SKCjugYBxJlBAIOZkw8cgGGQMKt/QgOS/CI4t
HbWhKKUlgMMmGE5hMJlAO7W71Ri9BuF9DiIOCQVhQwzHqOCo4JVhWPR6wSwWTUajtRhhbu3taISK
eciS4oNwtsiY52yB6XQZPgIdM6F4Ql10klnSoXlClRoyVHhF69qpOZAxvOgytPf79LQIFS8WTU1o
KyCBjklWk5sX0MiAnjk7+AdJA4cSNNAmTcmRluKwZ9SVJ1ZDoOFqgwL9EbcQ2Fyp6FtmBaLBlvA8
EForhRiHr8kTHBMVhh0cwwW6IY3i3KRLog/8XckU4UJD70g4sA==

Follow ups