correct dependency loop V00.02
authorymh <ymh.work@gmail.com>
Fri, 22 Jan 2010 02:39:52 +0100
changeset 7 92ccb522e945
parent 6 d5ca566fe8e1
child 8 e68b76e3ad73
correct dependency loop
sbin/sync_blinkster
web/blinkster/__init__.py
web/blinkster/models.py
--- a/sbin/sync_blinkster	Thu Jan 21 19:04:01 2010 +0100
+++ b/sbin/sync_blinkster	Fri Jan 22 02:39:52 2010 +0100
@@ -4,12 +4,13 @@
     rm -fr ~/tmp/blinkster_V$1;
 fi
 
-svn export file:///iridata/svn/blinkster/tags/V$1/web ~/tmp/blinkster_V$1
+hg archive -r V$1 ~/tmp/blinkster_V$1
 
 #text2unix ~/tmp/blinkster_V$1
 
 if [ -d ~/tmp/blinkster_V$1 ]; then
-    cat <<EOT | rsync -Cvrlz --delete --filter=". -" ~/tmp/blinkster_V$1/ web.iri.centrepompidou.fr:/iridata/www/web/blinkster/
+    cat <<EOT | rsync -Cvrlz --delete --filter=". -" ~/tmp/blinkster_V$1/web/ web.iri.centrepompidou.fr:/iridata/www/web/blinkster/
++ core
 P .htpasswd
 P .htaccess
 P blinkster/.htaccess
--- a/web/blinkster/__init__.py	Thu Jan 21 19:04:01 2010 +0100
+++ b/web/blinkster/__init__.py	Fri Jan 22 02:39:52 2010 +0100
@@ -1,3 +1,3 @@
-VERSION = (0,1)
+VERSION = (0,2)
 
-VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION)))
\ No newline at end of file
+VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION)))
--- a/web/blinkster/models.py	Thu Jan 21 19:04:01 2010 +0100
+++ b/web/blinkster/models.py	Fri Jan 22 02:39:52 2010 +0100
@@ -5,7 +5,9 @@
 import uuid
 import photologue.models
 from django.conf import settings
-from modeltranslation.utils import build_localized_fieldname
+
+def build_localized_fieldname(field_name, lang):
+    return '%s_%s' % (field_name, lang)
 
 def get_sid():
     return unicode(uuid.uuid1())
@@ -49,4 +51,4 @@
 
         return res
 
-admin.site.register(Roi) 
\ No newline at end of file
+admin.site.register(Roi)