Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
etersoft-build-utils
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
korinf
etersoft-build-utils
Commits
1040a295
Commit
1040a295
authored
Dec 12, 2014
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix BINARYREPO using
parent
e2b3a85f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
rpmbs
bin/rpmbs
+2
-2
rpmgp
bin/rpmgp
+4
-2
alt
share/eterbuild/functions/alt
+2
-2
No files found.
bin/rpmbs
View file @
1040a295
...
@@ -244,7 +244,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
...
@@ -244,7 +244,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
if
[
-n
"
$PREPARETASK
"
]
;
then
if
[
-n
"
$PREPARETASK
"
]
;
then
docmd ssh
$GIRARHOST
task add
$TASKNUMBER
repo
$PROJECTNAME
$TAG
2>&1 |
tee
$RPMDIR
/uploaded.log.tmp
docmd ssh
$GIRARHOST
task add
$TASKNUMBER
repo
$PROJECTNAME
$TAG
2>&1 |
tee
$RPMDIR
/uploaded.log.tmp
else
else
docmd ssh
$GIRARHOST
build
$(
usearg
-b
$BINARYREPO
)
$(
usearg
-p
$POCKET
)
$PROJECTNAME
$TAG
2>&1 |
tee
$RPMDIR
/uploaded.log.tmp
docmd ssh
$GIRARHOST
build
$(
usearg
-b
$BINARYREPO
sisyphus
)
$(
usearg
-p
$POCKET
)
$PROJECTNAME
$TAG
2>&1 |
tee
$RPMDIR
/uploaded.log.tmp
fi
fi
# FIXME: incorporate
# FIXME: incorporate
cat
$RPMDIR
/uploaded.log.tmp |
grep
task |
head
-n2
|
tail
-n1
>>
$RPMDIR
/uploaded.log
cat
$RPMDIR
/uploaded.log.tmp |
grep
task |
head
-n2
|
tail
-n1
>>
$RPMDIR
/uploaded.log
...
@@ -337,7 +337,7 @@ if [ -n "$PREPARETASK" ] ; then
...
@@ -337,7 +337,7 @@ if [ -n "$PREPARETASK" ] ; then
docmd ssh
$GIRARHOST
task add
$TASKNUMBER
$TASKLIST
2>&1 |
tee
$RPMDIR
/uploaded.log.tmp
docmd ssh
$GIRARHOST
task add
$TASKNUMBER
$TASKLIST
2>&1 |
tee
$RPMDIR
/uploaded.log.tmp
else
else
echo
"Create task for
$TASKLIST
"
echo
"Create task for
$TASKLIST
"
docmd ssh
$GIRARHOST
build
$(
usearg
-b
$BINARYREPO
)
$TASKLIST
2>&1 |
tee
$RPMDIR
/uploaded.log.tmp
docmd ssh
$GIRARHOST
build
$(
usearg
-b
$BINARYREPO
sisyphus
)
$TASKLIST
2>&1 |
tee
$RPMDIR
/uploaded.log.tmp
fi
fi
# FIXME: parse and incorporate
# FIXME: parse and incorporate
...
...
bin/rpmgp
View file @
1040a295
...
@@ -398,6 +398,7 @@ if [ -n "$CHECKONLINE" ] ; then
...
@@ -398,6 +398,7 @@ if [ -n "$CHECKONLINE" ] ; then
fi
fi
if
[
-n
"
$GIRAR_USER
"
]
;
then
if
[
-n
"
$GIRAR_USER
"
]
;
then
# FIXME: we have a function to get correct url
GITURL
=
"http://git.altlinux.org/people/
$GIRAR_USER
/packages/
$PKGNAME
.git"
GITURL
=
"http://git.altlinux.org/people/
$GIRAR_USER
/packages/
$PKGNAME
.git"
if
$GET
-d
$GITURL
;
then
if
$GET
-d
$GITURL
;
then
echog
"Published at
$GITURL
by
$GIRAR_USER
"
echog
"Published at
$GITURL
by
$GIRAR_USER
"
...
@@ -409,8 +410,9 @@ if [ -n "$CHECKONLINE" ] ; then
...
@@ -409,8 +410,9 @@ if [ -n "$CHECKONLINE" ] ; then
list_git_package
$PKGNAME
list_git_package
$PKGNAME
set_binaryrepo
$MENV
set_binaryrepo
$MENV
echo
-n
"ACL list for
$GIRARHOST
$BINARYREPO
: "
docmd ssh
$GIRARHOST
acl
$BINARYREPO
$PKGNAME
show
docmd
$ETERBUILDBIN
/gacl
$GIRARHOST
-b
$BINARYREPO
$PKGNAME
show
RET
=
"MISSED"
RET
=
"MISSED"
if
[
-n
"
$SRCRPM
"
]
;
then
if
[
-n
"
$SRCRPM
"
]
;
then
RSYNCPATH
=
$(
get_rsync_path
$GIRARHOST
$BINARYREPO
)
RSYNCPATH
=
$(
get_rsync_path
$GIRARHOST
$BINARYREPO
)
...
...
share/eterbuild/functions/alt
View file @
1040a295
...
@@ -65,7 +65,8 @@ get_type_by_current_branch()
...
@@ -65,7 +65,8 @@ get_type_by_current_branch()
# set BYNARYREPO var by MENV in arg (M50 or 5.0)
# set BYNARYREPO var by MENV in arg (M50 or 5.0)
set_binaryrepo
()
set_binaryrepo
()
{
{
BINARYREPO
=
""
BINARYREPO
=
"sisyphus"
if
[
-n
"
$BINARYREPONAME
"
]
;
then
if
[
-n
"
$BINARYREPONAME
"
]
;
then
BINARYREPO
=
"
$BINARYREPONAME
"
BINARYREPO
=
"
$BINARYREPONAME
"
MENV
=
"
$(
get_altdistr_mod
$BINARYREPO
)
"
MENV
=
"
$(
get_altdistr_mod
$BINARYREPO
)
"
...
@@ -78,7 +79,6 @@ set_binaryrepo()
...
@@ -78,7 +79,6 @@ set_binaryrepo()
BINARYREPO
=
"
`
get_altdistr_version
$1
`
"
BINARYREPO
=
"
`
get_altdistr_version
$1
`
"
[
"
$BINARYREPO
"
=
"sisyphus"
]
&&
BINARYREPO
=
""
return
0
return
0
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment