]> git.saurik.com Git - apt.git/log
apt.git
10 years agofix test/integration/test-apt-key-net-update
Michael Vogt [Thu, 12 Dec 2013 06:49:43 +0000 (07:49 +0100)] 
fix test/integration/test-apt-key-net-update

10 years agoclarify error message when apt-get source=ver fails, print a real error message inste...
Michael Vogt [Thu, 12 Dec 2013 06:41:17 +0000 (07:41 +0100)] 
clarify error message when apt-get source=ver fails, print a real error message instead of "ignoring"

10 years agofix test/integration/test-apt-key-net-update (code copy/DRY violation)
Michael Vogt [Wed, 11 Dec 2013 14:08:30 +0000 (15:08 +0100)] 
fix test/integration/test-apt-key-net-update (code copy/DRY violation)

10 years agoimprove error message
Michael Vogt [Wed, 11 Dec 2013 13:03:53 +0000 (14:03 +0100)] 
improve error message

10 years agoimprove error message for apt-get source pkg:arch{=ver,/release}
Michael Vogt [Wed, 11 Dec 2013 08:21:26 +0000 (09:21 +0100)] 
improve error message for apt-get source pkg:arch{=ver,/release}

10 years agoadd support for "apt-get source pkg:arch"
Michael Vogt [Wed, 11 Dec 2013 07:21:04 +0000 (08:21 +0100)] 
add support for "apt-get source pkg:arch"

10 years agouser-requested version tag gets precedence in apt-get source -t dist pkg=version...
Michael Vogt [Tue, 10 Dec 2013 16:09:56 +0000 (17:09 +0100)] 
user-requested version tag gets precedence in apt-get source -t dist pkg=version requests

10 years agofix typo
Michael Vogt [Tue, 10 Dec 2013 16:02:30 +0000 (17:02 +0100)] 
fix typo

10 years agoimprove test for #731853 and comments
Michael Vogt [Tue, 10 Dec 2013 15:43:25 +0000 (16:43 +0100)] 
improve test for #731853 and comments

10 years agoif there is only deb-src pick higest version in deb-src release matching
Michael Vogt [Tue, 10 Dec 2013 15:35:44 +0000 (16:35 +0100)] 
if there is only deb-src pick higest version in deb-src release matching

10 years agoMerge remote-tracking branch 'mvo/feature/deb-src-bts731102' into debian/sid
Michael Vogt [Tue, 10 Dec 2013 15:21:06 +0000 (16:21 +0100)] 
Merge remote-tracking branch 'mvo/feature/deb-src-bts731102' into debian/sid

10 years agoMerge remote-tracking branch 'origin/feature/source-deb822' into feature/source-deb822
Michael Vogt [Tue, 10 Dec 2013 07:15:17 +0000 (08:15 +0100)] 
Merge remote-tracking branch 'origin/feature/source-deb822' into feature/source-deb822

Conflicts:
apt-pkg/sourcelist.cc

10 years agoMerge remote-tracking branch 'upstream/debian/sid' into feature/source-deb822
Michael Vogt [Tue, 10 Dec 2013 07:13:42 +0000 (08:13 +0100)] 
Merge remote-tracking branch 'upstream/debian/sid' into feature/source-deb822

10 years agoMerge remote-tracking branch 'origin/feature/deb-src-bts731102' into feature/source...
Michael Vogt [Mon, 9 Dec 2013 10:21:14 +0000 (11:21 +0100)] 
Merge remote-tracking branch 'origin/feature/deb-src-bts731102' into feature/source-deb822

10 years agosuppoer $(ARCH) in deb822 sources.list as well
Michael Vogt [Mon, 9 Dec 2013 07:33:28 +0000 (08:33 +0100)] 
suppoer $(ARCH) in deb822 sources.list as well

10 years agoadd APT::Sources::Use-Deb822 to allow disabling the deb822 parser
Michael Vogt [Mon, 9 Dec 2013 07:30:01 +0000 (08:30 +0100)] 
add APT::Sources::Use-Deb822 to allow disabling the deb822 parser

10 years agomore refactor
Michael Vogt [Mon, 9 Dec 2013 07:21:53 +0000 (08:21 +0100)] 
more refactor

10 years agorefactor deb822 reading into its own function
Michael Vogt [Mon, 9 Dec 2013 06:59:18 +0000 (07:59 +0100)] 
refactor deb822 reading into its own function

10 years agoreally release 0.9.14 0.9.14
Michael Vogt [Sat, 7 Dec 2013 13:54:55 +0000 (14:54 +0100)] 
really release 0.9.14

10 years agodo not force a specific export-dir in the repository
David Kalnischkies [Sat, 7 Dec 2013 13:25:27 +0000 (14:25 +0100)] 
do not force a specific export-dir in the repository

Git-Dch: Ignore

10 years agoensure prepare-release works in the right directory
David Kalnischkies [Sat, 7 Dec 2013 13:12:52 +0000 (14:12 +0100)] 
ensure prepare-release works in the right directory

Git-Dch: Ignore

10 years agoreleasing package apt version 0.9.14
Michael Vogt [Sat, 7 Dec 2013 12:52:40 +0000 (13:52 +0100)] 
releasing package apt version 0.9.14

10 years agoupdate libapt-pkg4.12 symbols file
David Kalnischkies [Sat, 7 Dec 2013 12:48:46 +0000 (13:48 +0100)] 
update libapt-pkg4.12 symbols file

also fixing the release script code to deal with 'set -e' mode while
checking the symbols file.

10 years agotell the release script that we use git now
David Kalnischkies [Sat, 7 Dec 2013 12:05:19 +0000 (13:05 +0100)] 
tell the release script that we use git now

Git-Dch: Ignore

10 years agofix release script to deal with vendors
David Kalnischkies [Sat, 7 Dec 2013 11:56:26 +0000 (12:56 +0100)] 
fix release script to deal with vendors

Call xmllint with each vendor to check if any vendor specific errors are
present, but check the translations only with one vendor to check for
translation specifics – vendor and translation specific isn't possible.

Git-Dch: Ignore

10 years agoreleasing package apt version 0.9.13.2
Michael Vogt [Fri, 6 Dec 2013 16:29:55 +0000 (17:29 +0100)] 
releasing package apt version 0.9.13.2

10 years agofix build failure with the new apt-vendors stuff
Michael Vogt [Fri, 6 Dec 2013 16:29:50 +0000 (17:29 +0100)] 
fix build failure with the new apt-vendors stuff

10 years agoHandle SIGWINCH in APT::Progress-Fancy=1
Michael Vogt [Fri, 6 Dec 2013 14:54:12 +0000 (15:54 +0100)] 
Handle SIGWINCH in APT::Progress-Fancy=1

10 years agovendor/debian/makefile: apply 6f3c4e33 for debian/makefile as well
Michael Vogt [Fri, 6 Dec 2013 12:22:00 +0000 (13:22 +0100)] 
vendor/debian/makefile: apply 6f3c4e33 for debian/makefile as well

10 years agovendor/makefile: fix build error for parallel builds
Michael Vogt [Fri, 6 Dec 2013 07:00:43 +0000 (08:00 +0100)] 
vendor/makefile: fix build error for parallel builds

10 years agofix section adding
Michael Vogt [Mon, 2 Dec 2013 07:36:10 +0000 (08:36 +0100)] 
fix section adding

10 years agoadd unittest for new sourceslist parser as well
Michael Vogt [Mon, 2 Dec 2013 07:21:49 +0000 (08:21 +0100)] 
add unittest for new sourceslist parser as well

10 years agofirst version with test
Michael Vogt [Mon, 2 Dec 2013 07:01:00 +0000 (08:01 +0100)] 
first version with test

10 years ago* document Dpkg::Progress-Fancy (closes: 726169), thanks to James McCoy
Michael Vogt [Thu, 5 Dec 2013 07:48:48 +0000 (08:48 +0100)] 
* document Dpkg::Progress-Fancy (closes: 726169), thanks to James McCoy

10 years ago* enable release based selection for deb-src (closes: 731102)
Michael Vogt [Thu, 5 Dec 2013 07:11:11 +0000 (08:11 +0100)] 
* enable release based selection for deb-src (closes: 731102)

10 years agoremove exposing {MetaIndexInfo,MetaIndexFile,MetaIndexURI} again as this is package...
Michael Vogt [Thu, 5 Dec 2013 07:06:06 +0000 (08:06 +0100)] 
remove exposing {MetaIndexInfo,MetaIndexFile,MetaIndexURI} again as this is package system specific

10 years agoadd new LocalFileName() method to metaindex
Michael Vogt [Thu, 5 Dec 2013 06:53:53 +0000 (07:53 +0100)] 
add new LocalFileName() method to metaindex

10 years agorefactor
Michael Vogt [Wed, 4 Dec 2013 21:39:04 +0000 (22:39 +0100)] 
refactor

10 years agoadd #ifdefed ABI break & cleaner solution once the abi break is in place
Michael Vogt [Wed, 4 Dec 2013 16:58:36 +0000 (17:58 +0100)] 
add #ifdefed ABI break & cleaner solution once the abi break is in place

10 years agouse MetaIndexFile() instead of MetaIndexURI()
Michael Vogt [Wed, 4 Dec 2013 15:38:20 +0000 (16:38 +0100)] 
use MetaIndexFile() instead of MetaIndexURI()

10 years agorefactor FindSrc()
Michael Vogt [Wed, 4 Dec 2013 15:27:05 +0000 (16:27 +0100)] 
refactor FindSrc()

10 years agoadd test for aptget source for unavailable package
Michael Vogt [Wed, 4 Dec 2013 15:26:57 +0000 (16:26 +0100)] 
add test for aptget source for unavailable package

10 years agofurther refactor, extract GetReleaseForSourceRecord() out of FindSrc(), write out...
Michael Vogt [Wed, 4 Dec 2013 07:41:23 +0000 (08:41 +0100)] 
further refactor, extract GetReleaseForSourceRecord() out of FindSrc(), write out the selection notice to c1out to be consistent with the rest of the source

10 years agorefactor and move generation of the MetaIndex FileName out of the FindSrc()
Michael Vogt [Wed, 4 Dec 2013 07:18:58 +0000 (08:18 +0100)] 
refactor and move generation of the MetaIndex FileName out of the FindSrc()

10 years agoadd test, deal with InRelease
Michael Vogt [Wed, 4 Dec 2013 06:58:37 +0000 (07:58 +0100)] 
add test, deal with InRelease

10 years agoproof-of-concept for fixing debian #731102
Michael Vogt [Tue, 3 Dec 2013 20:49:02 +0000 (21:49 +0100)] 
proof-of-concept for fixing debian #731102

10 years agofix section adding
Michael Vogt [Mon, 2 Dec 2013 07:36:10 +0000 (08:36 +0100)] 
fix section adding

10 years agoadd unittest for new sourceslist parser as well
Michael Vogt [Mon, 2 Dec 2013 07:21:49 +0000 (08:21 +0100)] 
add unittest for new sourceslist parser as well

10 years agofirst version with test
Michael Vogt [Mon, 2 Dec 2013 07:01:00 +0000 (08:01 +0100)] 
first version with test

10 years agoprepare-release: declare the packages needed as source build deps.
Steve Langasek [Mon, 11 Jun 2012 22:36:02 +0000 (22:36 +0000)] 
prepare-release: declare the packages needed as source build deps.

10 years agodrop old /var/state to /var/lib transition artefacts
David Kalnischkies [Sat, 30 Nov 2013 23:05:34 +0000 (00:05 +0100)] 
drop old /var/state to /var/lib transition artefacts

Regardless of when this transition was, it is so long ago that everyone
who would still need this has a million other problems to deal with now
so lets just drop this code.

10 years agogenerate apt-key script with vendor info about keys
David Kalnischkies [Sat, 30 Nov 2013 22:11:43 +0000 (23:11 +0100)] 
generate apt-key script with vendor info about keys

The apt-key script uses quiet a few keyring files for operation which
are specific to the distribution it is build on and is hence one of the
most patched parts – even if it is not that often used anymore now that
a fragment directory for trusted.gpg exists.

10 years agocherry-pick ubuntus (disabled) net-update fixes
David Kalnischkies [Sat, 30 Nov 2013 22:07:20 +0000 (23:07 +0100)] 
cherry-pick ubuntus (disabled) net-update fixes

With the net-update command a special keyring can be downloaded and
imported into apt, which must be signed by a master key. Its is
currently disabled because of security problems with it – and the only
known user before that was Ubuntu.

11 years agouse a substvar to set the archive-keyring in debian/control
David Kalnischkies [Sat, 30 Nov 2013 21:07:38 +0000 (22:07 +0100)] 
use a substvar to set the archive-keyring in debian/control

Adds a small helper to extract the small information bits we store in
apt-vendor.ent and uses it in debian/rules to set apt:keyring as a
substvar for debian/control populated with the &keyring-package; info

11 years agoadd a vendor specific file to have configurable entities
David Kalnischkies [Sat, 30 Nov 2013 18:15:02 +0000 (19:15 +0100)] 
add a vendor specific file to have configurable entities

manpages sometimes refer to distro-specific things like the name of the
package providing the achive-keyring. Having a central place to
configure this helps in having it consistent in the manpages and allows
to load this info from other places in the buildsystem as well later.

11 years agointroduce a vendor system to change sources.list
David Kalnischkies [Sat, 30 Nov 2013 13:01:28 +0000 (14:01 +0100)] 
introduce a vendor system to change sources.list

Many derivatives make quiet a few simple changes to apt introducing
silly diffs just to change examples and co making it harder for
them to update apt and harder for us to merge real changes back.

First stop: doc/examples/sources.list

11 years agoenable NOISE for build logs to enable analyse
David Kalnischkies [Sat, 30 Nov 2013 12:15:01 +0000 (13:15 +0100)] 
enable NOISE for build logs to enable analyse

It was enabled for a (long) while in Ubuntu, but it shouldn't hurt to
enable it in Debian as well – especially now that Debian has automatic
analyses of the buildlogs which don't work that well without the 'noise'

11 years agomerge ubuntus apport reporting changes to reduce diff
David Kalnischkies [Sat, 30 Nov 2013 12:10:33 +0000 (13:10 +0100)] 
merge ubuntus apport reporting changes to reduce diff

apport reporting is still disabled by default, but it is available in
Debian/experimental at the moment and a diff is not a good idea anyway.

11 years agotests: add a webserverconfig method to abstract config
David Kalnischkies [Wed, 23 Oct 2013 14:32:48 +0000 (16:32 +0200)] 
tests: add a webserverconfig method to abstract config

The URI to use to set a config option is a bit arcane to write/remember
and checking if the setting was successful doubly so.

Git-Dch: Ignore

11 years agotests: rm pkgcache.bin in 719263 test
David Kalnischkies [Wed, 23 Oct 2013 10:26:44 +0000 (12:26 +0200)] 
tests: rm pkgcache.bin in 719263 test

As testcases are running really fast it can happen that files which are
changed in reality are considered unchanged as the modify time isn't
changed. What we could do is disable those caches by default, but some
tests actually depend on those and deriving too much from the default by
default (pun intended) is not a good idea for tests after all.

Git-Dch: Ignore

11 years agowebserver: use pthreads to handle multiple clients
David Kalnischkies [Wed, 16 Oct 2013 20:45:37 +0000 (22:45 +0200)] 
webserver: use pthreads to handle multiple clients

Clients like browsers prefer to open many connections and keep them open
for a while, so that pages with lot of subelements would take a while to
load (if at all), by using threads as all servers do some way or another
we can resolve this. libapt is not intended to be pthread-safe and stuff
like the storage of the last return code doesn't make too much sense if
multiple clients interact with us, but it is good enough for now and an
other interesting (mis)use of libapt in general.

Git-Dch: Ignore

11 years agowebserver: strip parameters from filename
David Kalnischkies [Wed, 16 Oct 2013 20:43:01 +0000 (22:43 +0200)] 
webserver: strip parameters from filename

Again, not (currently) used by the tests itself, but in interactive
usage of the webserver itself.

Git-Dch: Ignore

11 years agowebserver: add directoryIndex support defaulting to index.html
David Kalnischkies [Wed, 16 Oct 2013 16:43:21 +0000 (18:43 +0200)] 
webserver: add directoryIndex support defaulting to index.html

Git-Dch: Ignore

11 years agowebserver: implement ~user access to ~user/public_html/
David Kalnischkies [Wed, 16 Oct 2013 14:46:55 +0000 (16:46 +0200)] 
webserver: implement ~user access to ~user/public_html/

pretty much useless for the testcases, but handy to test the webserver
itself in 'real world' environments

Git-Dch: Ignore

11 years agotests: enhance https support in the testcases
David Kalnischkies [Sun, 13 Oct 2013 17:23:30 +0000 (19:23 +0200)] 
tests: enhance https support in the testcases

Git-Dch: Ignore

11 years agowebserver: spurious newline after data confuses curl
David Kalnischkies [Fri, 11 Oct 2013 11:21:01 +0000 (13:21 +0200)] 
webserver: spurious newline after data confuses curl

Webserver wrongly sends an additional newline after the data which
causes curl to believe that the next request on this socket has no
header data and so includes all headers in the data output.

Git-Dch: Ignore

11 years agotruncating /dev/null to zero is always successful
David Kalnischkies [Fri, 11 Oct 2013 11:07:01 +0000 (13:07 +0200)] 
truncating /dev/null to zero is always successful

Calling truncate on /dev/null can happen by the download methods if they
are instructed to download a file to /dev/null (as testcases are only
interested in the status code, but do not support HEAD requests yet)

So just ignore truncate calls on the /dev/null file as it is always
empty anyway, so truncating to zero isn't a problem.

Git-Dch: Ignore

11 years agoreleasing package apt version 0.9.13.1 0.9.13.1
Michael Vogt [Fri, 29 Nov 2013 19:50:36 +0000 (20:50 +0100)] 
releasing package apt version 0.9.13.1

11 years agofix apport report writing (LP: #1254499)
Michael Vogt [Fri, 29 Nov 2013 19:17:20 +0000 (20:17 +0100)] 
fix apport report writing (LP: #1254499)

11 years agoreset terminal on error (closes: #730795)
Michael Vogt [Fri, 29 Nov 2013 19:08:56 +0000 (20:08 +0100)] 
reset terminal on error (closes: #730795)

11 years agoupdate changelog
Michael Vogt [Fri, 29 Nov 2013 18:54:43 +0000 (19:54 +0100)] 
update changelog

11 years agofix crash when SetCandidateRelease is used
Michael Vogt [Fri, 29 Nov 2013 16:10:35 +0000 (17:10 +0100)] 
fix crash when SetCandidateRelease is used

11 years agoupdate changelog
Michael Vogt [Fri, 29 Nov 2013 13:16:11 +0000 (14:16 +0100)] 
update changelog

11 years agoMerge remote-tracking branch 'mvo/debian/sid' into debian/sid
Michael Vogt [Fri, 29 Nov 2013 12:39:45 +0000 (13:39 +0100)] 
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid

Conflicts:
apt-private/private-cmndline.cc

11 years agoMerge branch 'feature/edit-sources' into debian/sid
Michael Vogt [Fri, 29 Nov 2013 07:38:12 +0000 (08:38 +0100)] 
Merge branch 'feature/edit-sources' into debian/sid

11 years agoadd "APT::String::Endswith" and automatic adding of ".list" in apt edit-source
Michael Vogt [Fri, 29 Nov 2013 07:35:05 +0000 (08:35 +0100)] 
add "APT::String::Endswith" and automatic adding of ".list" in apt edit-source

11 years agoadd support for "apt edit-source foo" sources.list.d component editing
Michael Vogt [Fri, 29 Nov 2013 07:17:44 +0000 (08:17 +0100)] 
add support for "apt edit-source foo" sources.list.d component editing

11 years agoadd autopkgtest
Michael Vogt [Fri, 29 Nov 2013 06:42:12 +0000 (07:42 +0100)] 
add autopkgtest

11 years agoadd missing test/integration/test-bug-720597-build-dep-purge
Michael Vogt [Thu, 28 Nov 2013 20:24:38 +0000 (21:24 +0100)] 
add missing test/integration/test-bug-720597-build-dep-purge

11 years agoupdate changelog
Michael Vogt [Thu, 28 Nov 2013 19:02:51 +0000 (20:02 +0100)] 
update changelog

11 years agoMerge remote-tracking branch 'mvo/feature/short-list' into debian/sid
Michael Vogt [Thu, 28 Nov 2013 18:45:58 +0000 (19:45 +0100)] 
Merge remote-tracking branch 'mvo/feature/short-list' into debian/sid

11 years agoadd "-f" option to "build-dep" as sbuild is using it to fix regression with cross...
Michael Vogt [Thu, 28 Nov 2013 18:45:44 +0000 (19:45 +0100)] 
add "-f" option to "build-dep" as sbuild is using it to fix  regression with cross-building (LP: #1255806)

11 years agofix regression that APT::Keep-Fds is not honored (closes: #730490)
Michael Vogt [Thu, 28 Nov 2013 16:08:53 +0000 (17:08 +0100)] 
fix regression that APT::Keep-Fds is not honored (closes: #730490)

11 years agofix "apt-get --purge build-dep" (closes: #720597)
Michael Vogt [Thu, 28 Nov 2013 15:50:20 +0000 (16:50 +0100)] 
fix "apt-get  --purge build-dep" (closes: #720597)

11 years agomove EditSources into its own file
Michael Vogt [Thu, 28 Nov 2013 11:15:47 +0000 (12:15 +0100)] 
move EditSources into its own file

11 years agoadd check when sources.list changed
Michael Vogt [Tue, 26 Nov 2013 09:32:21 +0000 (10:32 +0100)] 
add check when sources.list changed

11 years agoadd syntax check for sources.list
Michael Vogt [Tue, 26 Nov 2013 08:22:40 +0000 (09:22 +0100)] 
add syntax check for sources.list

11 years agorename APT::Cmd::AllVersions -> APT::Cmd::All-Versions, APT::Cmd::UseRegexp -> APT...
Michael Vogt [Tue, 26 Nov 2013 08:04:48 +0000 (09:04 +0100)] 
rename APT::Cmd::AllVersions -> APT::Cmd::All-Versions, APT::Cmd::UseRegexp -> APT::Cmd::Use-Regexp

11 years agoadd APT::Cmd::List-Include-Summary
Michael Vogt [Tue, 26 Nov 2013 07:17:29 +0000 (08:17 +0100)] 
add APT::Cmd::List-Include-Summary

11 years agodo not show summary in "apt list"
Michael Vogt [Mon, 25 Nov 2013 15:35:02 +0000 (16:35 +0100)] 
do not show summary in "apt list"

11 years agoadd basic "edit-sources" command
Michael Vogt [Mon, 25 Nov 2013 07:36:57 +0000 (08:36 +0100)] 
add basic "edit-sources" command

11 years agoupload 0.9.13 to unstable
Michael Vogt [Sat, 23 Nov 2013 08:36:50 +0000 (09:36 +0100)] 
upload 0.9.13 to unstable

11 years agoChanged MinAgeSec to MinAge in /etc/cron.daily/apt:200,204 LP: #1206047
Michael Vogt [Sat, 23 Nov 2013 08:16:24 +0000 (09:16 +0100)] 
Changed MinAgeSec to MinAge in /etc/cron.daily/apt:200,204  LP: #1206047

11 years agosmall documentation updates 0.9.13_exp1
Michael Vogt [Fri, 1 Nov 2013 09:42:49 +0000 (10:42 +0100)] 
small documentation updates

11 years agoreleasing package apt version 0.9.13~exp1 0.9.13.exp1
Michael Vogt [Fri, 1 Nov 2013 09:03:16 +0000 (10:03 +0100)] 
releasing package apt version 0.9.13~exp1

11 years agoprepare new upload
Michael Vogt [Thu, 31 Oct 2013 22:37:10 +0000 (23:37 +0100)] 
prepare new upload

11 years agosetup LINES in apt-pkg/install-progress.cc
Michael Vogt [Thu, 31 Oct 2013 22:24:41 +0000 (23:24 +0100)] 
setup LINES in apt-pkg/install-progress.cc

11 years agouse StartDpkg() in PackageManagerProgressDeb822Fd as well
Michael Vogt [Thu, 31 Oct 2013 22:00:11 +0000 (23:00 +0100)] 
use StartDpkg()  in PackageManagerProgressDeb822Fd as well

11 years agoadd new pid_t ExecFork(std::set<int> KeepFDs) to get rid of the super ugly APT::Keep...
Michael Vogt [Thu, 31 Oct 2013 21:55:38 +0000 (22:55 +0100)] 
add new pid_t ExecFork(std::set<int> KeepFDs) to get rid of the super ugly APT::Keep-Fds hack and also add a new PackageManagerProgressFd::StartDpkg() progress state

11 years agomove pty magic into its own functions
Michael Vogt [Thu, 31 Oct 2013 20:03:33 +0000 (21:03 +0100)] 
move pty magic into its own functions