Merge pull request #15 from yymao/u/yymao/bug-fix

 Fix a bug introduced in efce158 (#14)

.github/workflows/pythonpackage.yml

@@ -1,6 +1,6 @@
 name: Python package
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -13,6 +13,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
+    - name: Cache Python packages
+      uses: actions/cache@v1
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('setup.py') }}
+        restore-keys: |
+          ${{ runner.os }}-py${{ matrix.python-version }}-pip-
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:

adstex.py

@@ -28,7 +28,7 @@
 except ImportError:
     from urllib import unquote
 
-__version__ = "0.3.3"
+__version__ = "0.3.4"
 
 _this_year = date.today().year % 100
 _this_cent = date.today().year // 100
@@ -391,11 +391,16 @@ def main():
         key_exists = key in bib.entries_dict
         key_exists_in_others = key in bib_other.entries_dict
 
-        if (key_exists and args.update) or (
-            key_exists_in_others and args.merge_other and args.update
-        ):
-            bibcode = extract_bibcode(bib.entries_dict[key])
-            bibcode_new = entry2bibcode(bib.entries_dict[key])
+        if args.update:
+            if key_exists:
+                bibcode = extract_bibcode(bib.entries_dict[key])
+                bibcode_new = entry2bibcode(bib.entries_dict[key])
+            elif key_exists_in_others and args.merge_other:
+                bibcode = extract_bibcode(bib_other.entries_dict[key])
+                bibcode_new = entry2bibcode(bib_other.entries_dict[key])
+            else:
+                bibcode_new = None
+
             if bibcode_new:
                 all_entries[bibcode_new].append(key)
                 if bibcode_new != bibcode or args.force_regenerate: