From 1f00cd3e5de8fa0a43bdca4edc2d632aad3996e9 Mon Sep 17 00:00:00 2001 From: Dean Jackson Date: Tue, 17 Jul 2018 00:22:52 +0200 Subject: [PATCH] Ensure util.appinfo() handles multiple apps with the same bundle ID --- ...kflow-1.34.zip => alfred-workflow-1.36.zip | Bin 85899 -> 85898 bytes tests/test_update.py | 3 +-- workflow/util.py | 2 +- workflow/version | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) rename alfred-workflow-1.34.zip => alfred-workflow-1.36.zip (95%) diff --git a/alfred-workflow-1.34.zip b/alfred-workflow-1.36.zip similarity index 95% rename from alfred-workflow-1.34.zip rename to alfred-workflow-1.36.zip index d0b52c620343b44a3ede93e7fca81e1c78400142..89952cb5cd50d0dd735c6d9e365698def300df1b 100644 GIT binary patch delta 2557 zcmVA9&#TS+>#yP<%3_Je>xDq{U+@2n~UxUQaqSU z0!m#hxvdTF0l+H#ZN?0{IaM_2Mh#Ei=`N!AnHtsZ3%9WVaWmLi{i7I9eth0;b*z62 zazhT#@{azx^CxGmHyq(-DcB4PRSknkp0`#j3aNc$hM99Ao{37!tBst)GcY^A_hBXM z0}HgMJ%b^;O*@A&C{OSJm`yO?zUdt^QvlZGCQFugI)jooT5}&@)3$5ze4VCHn?Ufq zMJZMdQ?=z6FDgR5yO8(7GQ|h!7<{(38+aDrBX8!m++j=1q?T@{7cwP z72q6Lc%mwBnOC40YlRFA*1C%*<;D0XH@F&HK1ZXhV%f0|qx(tzbLJ z?mF@QLfoNaXAZO;O|xES_qb-ye*HA7HneCyVlx!6)FDS)+ukpvCp;+%iS1DL#PHPF6PpBc z6rCE2==_3Ck*DJ9oIXr;N#W+lA3uLrCO5bn_s1W8N7{!Q?3#30!yMn{^ zeJV_nl){-a_T{bX$4B_#s4kCCfUzGYZM;Fq#&bUy0))LezFUn0aJY%&+iFJf5Mhi> zhE~l`+ir{gjSVPgao#I>o3%j9HVPN=2#OY22Za;e88EoS`xUi!(;$BikO7I}fvW|? zJuCQJrf4=Ra0qrz6ePd2bIyuC)P=B8aTDUXh|nF78D*2#kVWrghO4$#x0v?ai%=2D z?T{XSg>tW4+pI*J77>9kmiq+c4g??_uE8ZM1+QqRGo@)yr2Tb-`5@yx*xlI;80v() z0_I@5;7-PV!6zUtX?i7 zqw@8%hqhAXDS$ zIDBE*d4pEzVAL68;Y1FH*^LWUVSp|S(QT}#O`Ckj4ASZqY;u2Ksiw&mF*aVm0m&<+ z>#a8@(o!kS4Q&+1m$0Yg>eQ{oJQ)uVD0W=Z3T)-hOT47B%q(FW7fo6pT0dJCu5cFK z4?%{Z5XU`0pfFWwOt$hXxQ)_w1|8pE_QbAn96Rb9y>UzpnmC?XK|KvW(xH3q4mGAW zbTG!Zg09ZYV{(5@>_Q2usXEIA0NHA1f@r~lAJ;UfR0O~7vI=*%pU!R_xw`hoiz*JD zDz#T!YH!qVxwOt9Oi-<_ZQZF%~4@mu%%yT9z(uakN>@AN0Ez>uLxw%W8cCiNM$eti4Yu`0}+ z(M?>w^;C$6zRgaLPfkuRrow%Ddwlk8pnk<4LhNW~=$YUi=P=$Z`ykx+l9@OTrh=C7 z4*>S*V`#^p2N2y~3^0AP+21Zn18dF)9%+*~tTcbrTBDnM0sP`wFA37&(C(tMPyX8h zSi=pK+CFEIwy!XMaoHAS8kH(@jnZ@#QHQ(<>u zll|bu8?phrhd5X+Aw?-|OS$2NpVZ$e#a#U`=>rW%0|xh{ViVD)UqyZBL%9Yx&lNP zadGzc^7O;^wm#vDLuq>-jV<@+UiYOR;~STz7a3ol+GHtq z)qxMts3 zTCVN?l#mxb-!!KF9Q&nJdq7~TRogjlb>UJ=?z$+$V=ufG0Sa)B7T-#$T|3rH)%`S`HP%$_=7WcW2hfTbu}M)^Mzt=)zO6v z$h1hnOvzkCh3~E=u2p9`Hh6MRhq6M&jj&(R`N4P`#+Jpp5;0C42q}DwJu Rz6% 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 diff --git a/tests/test_update.py b/tests/test_update.py index 8f0dae7d..0b2c6d3d 100755 --- a/tests/test_update.py +++ b/tests/test_update.py @@ -133,8 +133,7 @@ def test_empty_repo(httpserver, info): """No releases""" # with webget(httpserver.url): with fakeresponse(httpserver, DATA_JSON_EMPTY, HTTP_HEADERS_JSON): - with pytest.raises(ValueError): - update.check_update(EMPTY_REPO_SLUG, '1.0') + update.check_update(EMPTY_REPO_SLUG, '1.0') assert len(update.get_valid_releases(EMPTY_REPO_SLUG)) == 0 diff --git a/workflow/util.py b/workflow/util.py index 89e62c01..257654e1 100644 --- a/workflow/util.py +++ b/workflow/util.py @@ -306,7 +306,7 @@ def appinfo(name): """ cmd = ['mdfind', '-onlyin', '/Applications', - '-onlyin', os.expanduser('~/Applications'), + '-onlyin', os.path.expanduser('~/Applications'), '(kMDItemContentTypeTree == com.apple.application &&' '(kMDItemDisplayName == "{0}" || kMDItemFSName == "{0}.app"))' .format(name)] diff --git a/workflow/version b/workflow/version index eda3ab3c..1caa5ab8 100644 --- a/workflow/version +++ b/workflow/version @@ -1 +1 @@ -1.34 \ No newline at end of file +1.36 \ No newline at end of file