Skip to content

Multiple bug fixes#459

Merged
fosskers merged 2 commits intofosskers:masterfrom
theotherjimmy:theotherjimmy-bugfix
Oct 7, 2017
Merged

Multiple bug fixes#459
fosskers merged 2 commits intofosskers:masterfrom
theotherjimmy:theotherjimmy-bugfix

Conversation

@theotherjimmy
Copy link
Contributor

@theotherjimmy theotherjimmy commented Sep 8, 2017 •
edited
Loading

  • Remove bash parsing from AUR dep handling
  • Stop parsing unicode needlessly (store PKGBUILDs as ByteString)

Fixes:
Resolves #456
Resolves #433
Resolves #427
Resolves #410
Resolves #398
Resolves #392
Resolves #391
Resolves #340

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Sep 8, 2017

It's not pretty, but it works:

jimmy:/home/jimmy/src/aura# sudo /home/jimmy/src/aura/.stack-work/install/x86_64-linux-ncurses6-nopie/lts-8.13/8.0.2/bin/aura -Ai jhbuild
Repository  : aur
Name        : jhbuild
Version     : 3.15.92+1416+ge4528807-2
AUR Status  : Up to Date
Maintainer  : rafaelff
Project URL : https://wiki.gnome.org/Projects/Jhbuild
AUR URL     : https://aur.archlinux.org/packages/jhbuild
License     : GPL
Depends On  : python2 git anthy argyllcms caribou check cmake cups docbook-sgml docbook-utils docbook-xsl dotconf doxygen espeak exempi fwupdate gmime gperf gtkspell3 hyphen intltool itstool kyotocabinet libatasmart libcanberra libdmapsharing libdvdread libgexiv2 libgphoto2 libhangul libical libmusicbrainz5 libndp liboauth libpwquality libraw libunwind libvirt libvpx llvm mpc ninja openldap opus plymouth poppler-glib ppp python-cairo python-pillow ragel ruby sane smbclient source-highlight startup-notification taglib udisks2 usbredir v4l-utils vala valgrind wavpack wget wireless_tools xf86-input-wacom xmlto xorg-server-xwayland xorg-util-macros xtrans
Build Deps  : yelp-tools
Votes       : 12
Popularity  : 0.16
Description : Tool to build the whole GNOME desktop from sources

jimmy:/home/jimmy/src/aura# aura -Ai jhbuild
Repository  : aur
Name        : jhbuild
Version     : 3.15.92+1416+ge4528807-2
AUR Status  : Up to Date
Maintainer  : rafaelff
Project URL : https://wiki.gnome.org/Projects/Jhbuild
AUR URL     : https://aur.archlinux.org/packages/jhbuild
License     : GPL
Depends On  : python2 git
Build Deps  : yelp-tools
Votes       : 12
Popularity  : 0.16
Description : Tool to build the whole GNOME desktop from sources

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Sep 8, 2017

Not done yet though:

jimmy:/home/jimmy/src/aura# sudo aura -A jhbuild
aura >>= Determining dependencies...
aura >>= Repository dependencies:
yelp-tools

aura >>= AUR Packages:
jhbuild

aura >>= Continue? [Y/n] 
resolving dependencies...
looking for conflicting packages...

Packages (3) itstool-2.0.2+5+g676f3f7-2  yelp-xsl-3.20.1-2  yelp-tools-3.18.0+1+g193c2bd-1

Total Download Size:   0.26 MiB
Total Installed Size:  1.70 MiB

:: Proceed with installation? [Y/n] 
:: Retrieving packages...
 yelp-xsl-3.20.1-2-any                                      232.8 KiB   699K/s 00:00 [#################################################] 100%
 itstool-2.0.2+5+g676f3f7-2-any                              18.1 KiB  0.00B/s 00:00 [#################################################] 100%
 yelp-tools-3.18.0+1+g193c2bd-1-any                          19.7 KiB  0.00B/s 00:00 [#################################################] 100%
(3/3) checking keys in keyring                                                       [#################################################] 100%
(3/3) checking package integrity                                                     [#################################################] 100%
(3/3) loading package files                                                          [#################################################] 100%
(3/3) checking for file conflicts                                                    [#################################################] 100%
(3/3) checking available disk space                                                  [#################################################] 100%
:: Processing package changes...
(1/3) installing yelp-xsl                                                            [#################################################] 100%
(2/3) installing itstool                                                             [#################################################] 100%
(3/3) installing yelp-tools                                                          [#################################################] 100%
:: Running post-transaction hooks...
(1/1) Arming ConditionNeedsUpdate...
aura >>= Building `jhbuild`...
aura >>= Well, building `jhbuild` failed.
aura >>= Dumping makepkg output in 3.. 2.. 1..
==> Making package: jhbuild 3.15.92+1416+ge4528807-2 (Fri Sep  8 11:56:08 CDT 2017)
==> Checking runtime dependencies...
==> Missing dependencies:
  -> anthy
  -> argyllcms
  -> caribou
  -> check
  -> cups
  -> docbook-sgml
  -> docbook-utils
  -> docbook-xsl
  -> dotconf
  -> doxygen
  -> exempi
  -> fwupdate
  -> gmime
  -> gperf
  -> gtkspell3
  -> intltool
  -> kyotocabinet
  -> libatasmart
  -> libcanberra
  -> libdmapsharing
  -> libgexiv2
  -> libgphoto2
  -> libhangul
  -> libical
  -> libmusicbrainz5
  -> libndp
  -> liboauth
  -> libpwquality
  -> libraw
  -> libvirt
  -> llvm
  -> mpc
  -> ninja
  -> openldap
  -> plymouth
  -> poppler-glib
  -> ppp
  -> python-cairo
  -> python-pillow
  -> ragel
  -> sane
  -> source-highlight
  -> udisks2
  -> vala
  -> valgrind
  -> xf86-input-wacom
  -> xmlto
  -> xtrans
==> Checking buildtime dependencies...
==> ERROR: Could not resolve all dependencies.
==> ERROR: An unknown error has occurred. Exiting...



aura >>= Would you like to continue anyway? [Y/n] n
aura >>= Building failed.
jimmy:/home/jimmy/src/aura# sudo /home/jimmy/src/aura/.stack-work/install/x86_64-linux-ncurses6-nopie/lts-8.13/8.0.2/bin/aura -A jhbuild
aura >>= Determining dependencies...
aura: fd:7: hGetContents: invalid argument (invalid byte sequence)

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Sep 8, 2017 

jimmy:/home/jimmy/src/aura# sudo /home/jimmy/src/aura/.stack-work/install/x86_64-linux-ncurses6-nopie/lts-8.13/8.0.2/bin/aura -A jhbuild
aura >>= Determining dependencies...
aura >>= Repository dependencies:
anthy
argyllcms
caribou
check
cups
docbook-sgml
docbook-utils
docbook-xsl
dotconf
doxygen
exempi
fwupdate
gmime
gperf
gtkspell3
intltool
kyotocabinet
libatasmart
libcanberra
libdmapsharing
libgexiv2
libgphoto2
libhangul
libical
libmusicbrainz5
libndp
liboauth
libpwquality
libraw
libvirt
llvm
mpc
ninja
openldap
poppler-glib
ppp
python-cairo
python-pillow
ragel
sane
source-highlight
udisks2
vala
valgrind
xf86-input-wacom
xmlto
xtrans

aura >>= AUR Packages:
jhbuild
plymouth

aura >>= Continue? [Y/n] y

IT WORKS!

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Sep 8, 2017

@fosskers Take a look please.

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Sep 8, 2017

It does aur queries at a blazing 3-7KB/s

@theotherjimmy theotherjimmy mentioned this pull request Sep 8, 2017
Closed
@fosskers
Copy link
Owner

fosskers commented Sep 10, 2017

Ho! Hot damn!

Unfortunately I'm going on vacation in a few days. I'll be back in two weeks where I can give this a proper review. Is that okay?

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Sep 10, 2017

How about we get @bb010g to review instead then?

@fosskers
Copy link
Owner

fosskers commented Sep 10, 2017

Sure, I trust his judgement.

I took a quick look at it after all - this isn't involving .SRCINFO yet eh (which is the dream).

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Sep 10, 2017

No, I expect that will be easier after switching to libgit. This actually used the aur rest api. The surprising bit is that it's not super slow, despite being completely serial.

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Sep 14, 2017

@bb010g Could you review when you get a chance?

@fosskers
Copy link
Owner

fosskers commented Sep 28, 2017

I'm back from vacation now.

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Sep 28, 2017

I hope you had a relaxing vacation. I take it you mentioned that as you are about to review?

@fosskers
Copy link
Owner

fosskers commented Sep 28, 2017

Not right this minute (I'm starting my work day), but yeah.

@fosskers fosskers merged commit c00e549 into fosskers:master Oct 7, 2017
@bb010g
Copy link
Contributor

bb010g commented Oct 7, 2017

Sorry for not having the time to review this; my schedule's been weird lately.

@fosskers
Copy link
Owner

fosskers commented Oct 7, 2017

Not a problem, that's life eh.

@fosskers fosskers mentioned this pull request Oct 7, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fosskers fosskers fosskers approved these changes

@bb010g bb010g Awaiting requested review from bb010g

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@theotherjimmy @fosskers @bb010g