Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Oskar Roesler
ros-aur-helpers
Commits
c7835417
Verified
Commit
c7835417
authored
Dec 06, 2020
by
Oskar Roesler
Browse files
Fix paths of package git repos in update.py
parent
333b4758
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
aurci/general.py
aurci/general.py
+2
-2
aurci/parser.py
aurci/parser.py
+1
-1
aurci/update.py
aurci/update.py
+1
-1
No files found.
aurci/general.py
View file @
c7835417
...
...
@@ -48,7 +48,7 @@ class Routines:
@
staticmethod
def
build_metainfo_dict
():
rosdistro_url
=
\
'https://raw.githubusercontent.com/ros/rosdistro/master/
melodic
/distribution.yaml'
f
'https://raw.githubusercontent.com/ros/rosdistro/master/
{
get_ros_distro
}
/distribution.yaml'
rosdistro
=
yaml
.
load
(
requests
.
get
(
rosdistro_url
,
allow_redirects
=
True
).
content
,
Loader
=
yaml
.
BaseLoader
)[
'repositories'
]
ros_dict
=
{}
...
...
@@ -79,7 +79,7 @@ class Routines:
def
get_ros_distro
(
self
):
config
=
self
.
get_config
()
return
config
[
'CI'
][
'GH_ORGANIZATION'
].
rstrip
(
"arch"
)
return
config
[
'CI'
][
'GH_ORGANIZATION'
].
split
(
'-'
)[
1
]
@
staticmethod
def
query_yes_no
(
question
,
default
=
"yes"
):
...
...
aurci/parser.py
View file @
c7835417
...
...
@@ -31,7 +31,7 @@ def main(argv):
args
=
parser
.
parse_args
(
argv
)
def
retry_with_rosdistro_name
():
name
=
"{0}{1}"
.
format
(
Routines
().
get_ros_distro
(),
args
.
package
)
name
=
"
ros-
{0}
-
{1}"
.
format
(
Routines
().
get_ros_distro
(),
args
.
package
)
if
os
.
path
.
exists
(
os
.
path
.
join
(
Routines
.
CACHE_ROOT
,
"packages/"
,
name
)):
try
:
commands
(
args
.
command
,
name
,
args
.
verbose
,
args
.
quiet
)
...
...
aurci/update.py
View file @
c7835417
...
...
@@ -21,7 +21,7 @@ class Update(Routines):
self
.
package_info
=
self
.
metainfo_dict
[
self
.
package
]
def
update_pkgbuild
(
self
):
os
.
chdir
(
os
.
path
.
join
(
"./packages"
,
self
.
package
)
)
os
.
chdir
(
self
.
repos_path
)
if
not
self
.
package_info
.
get
(
'pkgver'
,
None
):
print
(
'pkgver not in dict: {}'
.
format
(
self
.
package
))
return
(
self
.
package
,
'no_tag'
)
...
...
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