summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-04-16 18:09:54 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-04-16 18:09:54 +0200
commit9cf5db29e0969cd1b77760a5183354af9d6dbd8e (patch)
tree3a2a64e6ee1dce32213e1cbfe95d441be3635e64
parentb226a3bcc6bcc0c2e567b3784d3ed17237138119 (diff)
downloadIshtar-9cf5db29e0969cd1b77760a5183354af9d6dbd8e.tar.bz2
Ishtar-9cf5db29e0969cd1b77760a5183354af9d6dbd8e.zip
Small fix on DBF import of operations
-rw-r--r--archaeological_operations/import_from_dbf.py2
-rwxr-xr-xarchaeological_operations/management/commands/import_operations.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/archaeological_operations/import_from_dbf.py b/archaeological_operations/import_from_dbf.py
index d0f55cdbe..843e5151c 100644
--- a/archaeological_operations/import_from_dbf.py
+++ b/archaeological_operations/import_from_dbf.py
@@ -247,8 +247,6 @@ def import_operations_dbf(values, col_defs=DBF_OPE_COLS, update=False,
for line_idx, vals in enumerate(values):
if stdout:
stdout.write("\r* line %d" % (line_idx))
- if not line_idx:
- continue # remove header
args = {}
for col_idx, val in enumerate(vals):
if len(col_defs) <= col_idx or not col_defs[col_idx]:
diff --git a/archaeological_operations/management/commands/import_operations.py b/archaeological_operations/management/commands/import_operations.py
index cdcbff54b..3cf4a569d 100755
--- a/archaeological_operations/management/commands/import_operations.py
+++ b/archaeological_operations/management/commands/import_operations.py
@@ -33,7 +33,7 @@ class Command(BaseCommand):
def handle(self, *args, **options):
if not args or not args[0]:
- raise CommandError("No file provided." % args[0])
+ raise CommandError("No file provided.")
filename = args[0]
update = len(args) > 1 and args[1]
file_type = len(args) > 1 and args[2]