Skip to content

Commit

Permalink
git subrepo pull uno
Browse files Browse the repository at this point in the history
subrepo:
  subdir:   "uno"
  merged:   "fc460e65"
upstream:
  origin:   "https://github.com/prrvchr/uno.git"
  branch:   "main"
  commit:   "fc460e65"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
  • Loading branch information
prrvchr committed Oct 9, 2024
1 parent 70ff26c commit 0d4cc03
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions uno/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/prrvchr/uno.git
branch = main
commit = 0d1f022751bf5c2401de6dfe1babeddfc7102cb2
parent = 9a91d4cd57eaa3bfb70f63698604364f40e97feb
commit = fc460e65757a028376650e7e259785c2583052cd
parent = 70ff26c9c057bafdf6e841d8e64142e9a895daa9
method = merge
cmdver = 0.4.3
3 changes: 0 additions & 3 deletions uno/lib/uno/card/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@

from .dbtool import getDriverPropertyInfos

# FIXME Import necessary exclusively for vCardOOo
from .unotool import getUrl

from .configuration import g_defaultlog
from .configuration import g_host
from .configuration import g_identifier
Expand Down
6 changes: 4 additions & 2 deletions uno/lib/uno/card/card/provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,14 @@ def pullCard(self, database, user, addressbook, pages, count):
def parseCard(self, database):
raise NotImplementedError

def raiseForStatus(self, source, cls, mtd, response, parameter, user):
def raiseForStatus(self, source, cls, mtd, response, user):
name = response.Parameter.Name
url = response.Parameter.Url
status = response.StatusCode
msg = response.Text
response.close()
raise getSqlException(self._ctx, source, 1006, 1601, cls, mtd,
parameter.Name, status, user, parameter.Url, msg)
name, status, user, url, msg)

def getLoggerArgs(self, response, mtd, parameter, user):
status = response.StatusCode
Expand Down

0 comments on commit 0d4cc03

Please sign in to comment.