Skip to content

E
etersoft-build-utils
Commit e43f8fea authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

small fixes

parent 76476095
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
bin/rpmbs
View file @ e43f8fea
...@@ -136,7 +136,7 @@ check_gear_and_tag() ...@@ -136,7 +136,7 @@ check_gear_and_tag()
if $GEARCTAG $FORCE 2>&1 | grep -q "Too many specfiles found"; then if $GEARCTAG $FORCE 2>&1 | grep -q "Too many specfiles found"; then
docmd $GEARCTAG $FORCE -r .gear/$(readlink .gear/rules) && RESULT=0 docmd $GEARCTAG $FORCE -r .gear/$(readlink .gear/rules) && RESULT=0
elif $GEARCTAG $FORCE 2>&1 | grep -q "already exists"; then elif $GEARCTAG $FORCE 2>&1 | grep -q "already exists"; then
is_last_commit_tag || fatal "Tag $(get_last_tag) is set NOT on the last commit! Use -f key for override tag" is_last_commit_tag || fatal "Tag is set NOT on the last commit! Use -f key for override tag"
RESULT=1 RESULT=1
fi fi
fi fi
......
bin/rpmgs
View file @ e43f8fea
...@@ -103,7 +103,7 @@ function source_ext() ...@@ -103,7 +103,7 @@ function source_ext()
[ "$SN" = "0" ] && SN="$SN\?" [ "$SN" = "0" ] && SN="$SN\?"
if grep -q "# Source$SN-$2:" "$1" ; then if grep -q "# Source$SN-$2:" "$1" ; then
local TMPSPEC=$1.tmpurl local TMPSPEC=$1.tmpurl
local NEWSOURCE=$(grep "# Source$SN-$2:" "$1" | sed -e "s/.*$2:[ \t]*//g" | tail -n1) local NEWSOURCE=$(grep --text "# Source$SN-$2:" "$1" | sed -e "s/.*$2:[ \t]*//g" | tail -n1)
test -n "$NEWSOURCE" || fatal "Can't extract URL from Source$SN-$2" test -n "$NEWSOURCE" || fatal "Can't extract URL from Source$SN-$2"
# Fake replace for correct subst variables # Fake replace for correct subst variables
NEWSOURCE="$(echo "$NEWSOURCE" | sed -e 's|\&|\\&|g')" NEWSOURCE="$(echo "$NEWSOURCE" | sed -e 's|\&|\\&|g')"
......
etc/repos/srpms
View file @ e43f8fea
...@@ -6,7 +6,7 @@ alt ftp://ftp.altlinux.ru/pub/distributions/ALTLinux/Sisyphus/files ...@@ -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 #altp7 ftp://ftp.altlinux.ru/pub/distributions/ALTLinux/p7/branch/files/SRPMS
altautoimports http://autoimports.altlinux.org/pub/ALTLinux/autoimports/Sisyphus/files/SRPMS altautoimports http://autoimports.altlinux.org/pub/ALTLinux/autoimports/Sisyphus/files/SRPMS
altfcimport http://autoimports.altlinux.org/pub/ALTLinux/fcimport/Sisyphus/files/SRPMS altfcimport http://autoimports.altlinux.org/pub/ALTLinux/fcimport/Sisyphus/files/SRPMS
fedora24 http://mirror.yandex.ru/fedora/linux/development/24/source/SRPMS fedora25 http://mirror.yandex.ru/fedora/linux/development/25/source/SRPMS
#fedora-test http://mirror.yandex.ru/fedora/linux/releases/test/Fedora/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-rawhide http://mirror.yandex.ru/fedora/linux/development/rawhide/source/SRPMS
fedora-ccrma http://ccrma.stanford.edu/planetccrma/mirror/fedora/linux/planetccrma/9/SRPMS fedora-ccrma http://ccrma.stanford.edu/planetccrma/mirror/fedora/linux/planetccrma/9/SRPMS
......
share/eterbuild/functions/spec
View file @ e43f8fea
...@@ -237,7 +237,7 @@ add_changelog_helper() ...@@ -237,7 +237,7 @@ add_changelog_helper()
if [ "$R" = "0" ]; then if [ "$R" = "0" ]; then
local SPEC local SPEC
for SPEC in $SPECS ; do for SPEC in $SPECS ; do
N=`grep -n '^%changelog' $SPEC | head -n 1 | sed s!:.*!!g` N=`grep --text -n '^%changelog' $SPEC | head -n 1 | sed s!:.*!!g`
# +1 -- comment with date and packager name # +1 -- comment with date and packager name
# +2 -- place for edit comments # +2 -- place for edit comments
# +N works for mcedit and vi # +N works for mcedit and vi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment