Skip to content

Import #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jun 22, 2015
Merged

Import #210

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5cb349b
basic import seems to work
geier May 5, 2015
57ca2a3
import: batch and random_uid flags
geier Jun 4, 2015
adee3b7
moving ics_from_list to aux
geier Jun 4, 2015
ecb9f39
fixed import
geier Jun 4, 2015
2f92c8b
relative imports
geier Jun 4, 2015
372f741
make flake8 happy
geier Jun 4, 2015
1549c81
notes on removing a hack after text vdirsyncer release
geier Jun 9, 2015
97a76df
another intermediate fix
geier Jun 22, 2015
59f6056
removed unused import
geier Jun 22, 2015
499d0d5
ask for confirmation before overwriting
geier Jun 22, 2015
2a59fd8
bugfix
geier Jun 22, 2015
28834e8
doc strings
geier Jun 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
another intermediate fix 
that function can alltogether be removed after the next vdirsyncer
release
  • Loading branch information
@geier
geier committed Jun 22, 2015
commit 97a76dfa8aeb8f251d59e7774de0737d84a1746d
6 changes: 5 additions & 1 deletion khal/khalendar/khalendar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,11 @@ def force_update(self, event):
# AlreadyExistingError now knows the conflicting events uid
def check(self, item):
"""check if this an event with this item's uid already exists"""
href = self._deterministic_href(item)
try:
# FIXME remove on next vdirsyncer release
href = self._deterministic_href(item)
except AttributeError:
href = self._get_href(item.uid)
if not self.has(href):
return None, None
else:
Expand Down