Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backport stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Thu, 08 Dec 2011 14:32:57 +0100
changeset 8119 29cdde6bb9ef
parent 8116 6510654269a6 (current diff)
parent 8118 7b2c7f3d3703 (diff)
child 8120 793d2d327b3e
backport stable
.hgtags file | annotate | diff | comparison | revisions
__pkginfo__.py file | annotate | diff | comparison | revisions
cwconfig.py file | annotate | diff | comparison | revisions
debian/changelog file | annotate | diff | comparison | revisions
migration.py file | annotate | diff | comparison | revisions 
--- a/.hgtags	Thu Dec 08 14:30:00 2011 +0100
+++ b/.hgtags	Thu Dec 08 14:32:57 2011 +0100
@@ -235,3 +235,5 @@
 0a3cb5e60d57a7a9851371b4ae487094ec2bf614 cubicweb-debian-version-3.13.9-1
 5c4390eb10c3fe76a81e6fccec109d7097dc1a8d cubicweb-version-3.14.0
 0bfe22fceb383b46d62b437bf5dd0141a714afb8 cubicweb-debian-version-3.14.0-1
+2ad4e5173c73a43804c265207bcabb8940bd42f4 cubicweb-version-3.13.10
+2eab9a5a6bf8e3b0cf706bee8cdf697759c0a33a cubicweb-debian-version-3.13.10-1
--- a/cwconfig.py	Thu Dec 08 14:30:00 2011 +0100
+++ b/cwconfig.py	Thu Dec 08 14:32:57 2011 +0100
@@ -1149,7 +1149,7 @@
 
     def _gettext_init(self):
         """set language for gettext"""
-        from gettext import translation
+        from cubicweb.gettext import translation
         path = join(self.apphome, 'i18n')
         for language in self.available_languages():
             self.info("loading language %s", language)
--- a/debian/changelog	Thu Dec 08 14:30:00 2011 +0100
+++ b/debian/changelog	Thu Dec 08 14:32:57 2011 +0100
@@ -4,6 +4,12 @@
 
  -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Wed, 09 Nov 2011 17:17:45 +0100
 
+cubicweb (3.13.10-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Thu, 08 Dec 2011 13:22:05 +0100
+
 cubicweb (3.13.9-1) unstable; urgency=low
 
   * new upstream release
--- a/migration.py	Thu Dec 08 14:30:00 2011 +0100
+++ b/migration.py	Thu Dec 08 14:32:57 2011 +0100
@@ -270,7 +270,10 @@
         def unicode_raw_input(prompt):
             return unicode(raw_input(prompt), sys.stdin.encoding)
         interact(banner, readfunc=unicode_raw_input, local=local_ctx)
-        readline.write_history_file(histfile)
+        try:
+            readline.write_history_file(histfile)
+        except IOError:
+            pass
         # delete instance's confirm attribute to avoid questions
         del self.confirm
         self.need_wrap = True
@@ -412,7 +415,7 @@
         basecubes = [c for c in origcubes if not c in toremove]
         self.config._cubes = tuple(self.config.expand_cubes(basecubes))
         removed = [p for p in origcubes if not p in self.config._cubes]
-        if not cube in removed:
+        if not cube in removed and cube in origcubes:
             raise ConfigurationError("can't remove cube %s, "
                                      "used as a dependency" % cube)
         return removed
cubicweb