[haiku-commits] Re: haiku: hrev53129 - src/tools build/jam/repositories/HaikuPorts

  • From: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 15 May 2019 20:02:21 +1200

On Wed., 15 May 2019, 14:44 waddlesplash, <waddlesplash@xxxxxxxxx> wrote:

hrev53129 adds 2 changesets to branch 'master'
old head: aefa412c98327a6a0c14898f8a43e399dfd1e37e
new head: 8e05933bc8f796be6afdc1ee918dd74eac70a999
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=8e05933bc8f7+%5Eaefa412c9832


----------------------------------------------------------------------------

4bca5362cdba: hardlink_packages: Use subprocess instead of os to check for
package_repo.

8e05933bc8f7: HaikuPorts: Add libopenmpt_x86 on x86_gcc2.

                              [ Augustin Cavalier <waddlesplash@xxxxxxxxx>
]


----------------------------------------------------------------------------

2 files changed, 7 insertions(+), 3 deletions(-)
build/jam/repositories/HaikuPorts/x86_gcc2 | 3 +++
src/tools/hardlink_packages.py             | 7 ++++---


############################################################################

Commit:      4bca5362cdbab1889cb6df09931ec4c0be702eac
URL:         https://git.haiku-os.org/haiku/commit/?id=4bca5362cdba
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Wed May 15 02:40:17 2019 UTC

hardlink_packages: Use subprocess instead of os to check for package_repo.


----------------------------------------------------------------------------

diff --git a/src/tools/hardlink_packages.py
b/src/tools/hardlink_packages.py
index 2b8a84023b..240e48321f 100755
--- a/src/tools/hardlink_packages.py
+++ b/src/tools/hardlink_packages.py
@@ -7,9 +7,9 @@
 # Copyright 2017-2019 Augustin Cavalier <waddlesplash>
 # Distributed under the terms of the MIT License.

-import sys, os, re, hashlib
+import sys, os, subprocess, re, hashlib

-if len(sys.argv) < 5:
+if len(sys.argv) > 5:


Shouldn't it be != 5 here? Neither check seems correct...

        print("usage: hardlink_packages.py [arch] [jam
RemotePackageRepository file] "
                + "[prebuilt packages directory] [destination root
directory]")
        print("note that the [jam RemotePackageRepository file] will be
modified.")
@@ -17,7 +17,8 @@ if len(sys.argv) < 5:
                + " and a repo.info.template file (using $ARCH$)")
        sys.exit(1)

-if os.system('package_repo') != 1:
+if subprocess.run(['package_repo'], None, None, None,
+               subprocess.DEVNULL, subprocess.PIPE).returncode != 1:
        print("package_repo command does not seem to exist.")
        sys.exit(1)



############################################################################

Revision:    hrev53129
Commit:      8e05933bc8f796be6afdc1ee918dd74eac70a999
URL:         https://git.haiku-os.org/haiku/commit/?id=8e05933bc8f7
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Wed May 15 02:43:57 2019 UTC

HaikuPorts: Add libopenmpt_x86 on x86_gcc2.


----------------------------------------------------------------------------

diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2
b/build/jam/repositories/HaikuPorts/x86_gcc2
index 70d595907a..82c4b120cc 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -217,6 +217,8 @@ RemotePackageRepository HaikuPorts
        libmodplug_x86-0.8.9.0-1
        libogg_x86-1.3.3-2
        libogg_x86_devel-1.3.3-2
+       libopenmpt_x86-0.4.4-3
+       libopenmpt_x86_devel-0.4.4-3
        libpng16_x86-1.6.37-1
        libpng16_x86_devel-1.6.37-1
        libsolv_x86-0.3.0_haiku_2014_12_22-3
@@ -335,6 +337,7 @@ RemotePackageRepository HaikuPorts
        libmodplug
        libogg
        libogg_x86
+       libopenmpt_x86
        libpcap
        libpcre
        libpcre2



Other related posts: