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
89794c9a
Commit
89794c9a
authored
Apr 16, 2016
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add some asserts for non empty MENV
parent
f4148eff
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
alt
share/eterbuild/functions/alt
+4
-3
common
share/eterbuild/functions/common
+1
-0
No files found.
share/eterbuild/functions/alt
View file @
89794c9a
...
...
@@ -15,8 +15,8 @@ is_alt()
set_target_type
()
{
# check for M51 and so on
if
echo
$1
| egrep
-q
"^M[0-9][0-9].?$"
;
then
MENV
=
$1
if
echo
"
$1
"
| egrep
-q
"^M[0-9][0-9].?$"
;
then
MENV
=
"
$1
"
return
0
fi
case
"
$1
"
in
...
...
@@ -48,6 +48,7 @@ get_type_by_git_branch_name()
echo
$1
return
fi
# it is ok to do nothing here
}
get_type_by_current_branch
()
...
...
@@ -94,7 +95,7 @@ get_altdistr_mod()
# Проверяем, соответствует ли релиз пакетов указанному в MENV
pkg_release_check
()
{
# assert
MENV
assert_var
MENV
local
STREL
=
$(
get_default_txtrelease
)
# support alt in any case
local
STRELDEF
=
alt
...
...
share/eterbuild/functions/common
View file @
89794c9a
...
...
@@ -357,6 +357,7 @@ set_target_pkg_env()
PKGVENDOR
=
$(
$DISTRVENDOR
-s
"
$DISTRNAME
"
)
RPMVENDOR
=
$(
$DISTRVENDOR
-n
"
$DISTRNAME
"
)
[
-n
"
$MENV
"
]
||
MENV
=
"
$(
get_altdistr_mod
"
$DISTRVERSION
"
)
"
assert_var MENV
}
# We believe that follow vars correctly in any way:
...
...
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