From c1afd26d6f97089f679303ea719575f06bd4f60f Mon Sep 17 00:00:00 2001
From: ksunden <sunden@wisc.edu>
Date: Wed, 8 May 2019 23:39:51 -0500
Subject: [PATCH] ENH: Don't fail on import, warn instead

---
 pubs/commands/import_cmd.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pubs/commands/import_cmd.py b/pubs/commands/import_cmd.py
index 948d10d..dbc5480 100644
--- a/pubs/commands/import_cmd.py
+++ b/pubs/commands/import_cmd.py
@@ -104,7 +104,14 @@ def command(conf, args):
     keys = args.keys or papers.keys()
     for k in keys:
         p = papers[k]
-        rp.push_paper(p, overwrite=args.overwrite)
+        try:
+            rp.push_paper(p, overwrite=args.overwrite)
+        except repo.CiteKeyCollision:
+            ui.warning("{} already in repository, use '-O' to overwrite".format(
+                    color.dye_out(p.citekey, 'citekey')
+                )
+            )
+            continue
         ui.info('{} imported.'.format(color.dye_out(p.citekey, 'citekey')))
         docfile = bibstruct.extract_docfile(p.bibdata)
         if docfile is None: