prevent adding new images with existing sources

[redakcja.git] / apps / catalogue / management / commands / merge_books.py

diff --git a/apps/catalogue/management/commands/merge_books.py b/apps/catalogue/management/commands/merge_books.py
old mode 100755 (executable)
new mode 100644 (file)
index 00014df..82bd622
--- a/apps/catalogue/management/commands/merge_books.py
+++ b/apps/catalogue/management/commands/merge_books.py
@@ -8,7 +8,6 @@ from django.core.management.base import BaseCommand
 from django.core.management.color import color_style
 from django.db import transaction
 
-from slughifi import slughifi
 from catalogue.models import Book
 
 
@@ -111,8 +110,8 @@ class Command(BaseCommand):
         force = options.get('force')
         guess = options.get('guess')
         dry_run = options.get('dry_run')
-        new_slug = options.get('new_slug')
-        new_title = options.get('new_title')
+        new_slug = options.get('new_slug').decode('utf-8')
+        new_title = options.get('new_title').decode('utf-8')
         verbose = options.get('verbose')
 
         if guess:
@@ -127,9 +126,7 @@ class Command(BaseCommand):
             return
 
         # Start transaction management.
-        transaction.commit_unless_managed()
         transaction.enter_transaction_management()
-        transaction.managed(True)
 
         books = [Book.objects.get(slug=slug) for slug in slugs]
         common_slug = common_prefix(slugs)