From f5d9fc3fecafebe51585916a21c6337e8a326d5a Mon Sep 17 00:00:00 2001 From: Vitaly Lipatov <lav@etersoft.ru> Date: Sat, 20 Aug 2016 22:05:21 +0300 Subject: [PATCH] small changes --- TODO | 7 +++++++ bin/rpmbph | 9 +-------- bin/rpmgp | 1 + etc/repos/srpms | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/TODO b/TODO index 86b9270..d6a519a 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,10 @@ +Source-git: +git remote add upstream +git fetch +git merge vVERSION +add_changelog +gammit + ia32-libs не прибавляется к x86_64 там, где это нужно (Astra) rpmgs комиттит в текущий каталог!!! diff --git a/bin/rpmbph b/bin/rpmbph index ea2546a..4e82f65 100755 --- a/bin/rpmbph +++ b/bin/rpmbph @@ -93,8 +93,7 @@ fi [ -n "$VERBOSE" ] && echo "DISTRVERSION=$DISTRVERSION LISTRPMARGS=$LISTRPMARGS" if [ -z "$BUILDCOMMAND" ] ; then - BUILDCOMMAND="$ETERBUILDBIN/rpmbsh $GIRARHOST" - [ -n "$NOBUILD" ] && BUILDCOMMAND="$ETERBUILDBIN/rpmbs $GIRARHOST" + [ -n "$NOBUILD" ] && BUILDCOMMAND="$ETERBUILDBIN/rpmbs $GIRARHOST" || BUILDCOMMAND="$ETERBUILDBIN/rpmbsh $GIRARHOST" fi # set SPECDIR from LISTNAMES if empty (need for is_gear below) @@ -119,12 +118,6 @@ if [ "$PKGVENDOR" = "alt" ] && is_gear $SPECDIR ; then echo "Exists $OLDBRANCH branch, will use it instead $USEBRANCH" USEBRANCH=$OLDBRANCH fi - # hack about p5, M50 -> p5 - #if [ "$USEBRANCH" = "M50" ] && is_exist_branch p5 ; then - # USENUMBRANCH=p5 - # echo "Exists $USENUMBRANCH branch, will use it instead $USEBRANCH" - # USEBRANCH=$USENUMBRANCH - #fi fi # set branch name diff --git a/bin/rpmgp b/bin/rpmgp index b5939b1..5fab11d 100755 --- a/bin/rpmgp +++ b/bin/rpmgp @@ -476,6 +476,7 @@ fi # Check all systems if [ -n "$ALLSYSTEM" ] ; then + #info "Note: you can use whohas also" NFLAG= load_systems_list # search throw all systems diff --git a/etc/repos/srpms b/etc/repos/srpms index 13ef579..997c7bb 100644 --- a/etc/repos/srpms +++ b/etc/repos/srpms @@ -6,7 +6,7 @@ alt ftp://ftp.altlinux.ru/pub/distributions/ALTLinux/Sisyphus/files #altp7 ftp://ftp.altlinux.ru/pub/distributions/ALTLinux/p7/branch/files/SRPMS altautoimports http://autoimports.altlinux.org/pub/ALTLinux/autoimports/Sisyphus/files/SRPMS altfcimport http://autoimports.altlinux.org/pub/ALTLinux/fcimport/Sisyphus/files/SRPMS -fedora23 http://mirror.yandex.ru/fedora/linux/development/23/source/SRPMS +fedora24 http://mirror.yandex.ru/fedora/linux/development/24/source/SRPMS #fedora-test http://mirror.yandex.ru/fedora/linux/releases/test/Fedora/source/SRPMS fedora-rawhide http://mirror.yandex.ru/fedora/linux/development/rawhide/source/SRPMS fedora-ccrma http://ccrma.stanford.edu/planetccrma/mirror/fedora/linux/planetccrma/9/SRPMS -- 2.24.1