diff options
Diffstat (limited to 'modules/buildsystem')
-rw-r--r-- | modules/buildsystem/files/Mageia.pm | 2 | ||||
-rw-r--r-- | modules/buildsystem/manifests/init.pp | 10 | ||||
-rwxr-xr-x | modules/buildsystem/templates/mdv-youri-submit | 2 | ||||
-rwxr-xr-x | modules/buildsystem/templates/mga-youri-submit | 2 | ||||
-rwxr-xr-x | modules/buildsystem/templates/mga-youri-submit.wrapper (renamed from modules/buildsystem/templates/mdv-youri-submit.wrapper) | 2 | ||||
-rw-r--r-- | modules/buildsystem/templates/repsys.conf | 2 | ||||
-rw-r--r-- | modules/buildsystem/templates/sudoers.youri | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/modules/buildsystem/files/Mageia.pm b/modules/buildsystem/files/Mageia.pm index ce4ed478..109aeb29 100644 --- a/modules/buildsystem/files/Mageia.pm +++ b/modules/buildsystem/files/Mageia.pm @@ -415,7 +415,7 @@ sub _get_section { if (!$section) { # debug packages should be found by previous specific version search # NOTE: as above, should/need we search here and add the 'debug_' prefix? - # ... probably... as at least mdv-youri-submit-force will process debug packages + # ... probably... as at least mga-youri-submit-force will process debug packages if ($package->is_debug() && $self->{_verbose}) { print "Warning: debug package $name with version $version-$release not found.\n"; } diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp index d930d6da..2eabd190 100644 --- a/modules/buildsystem/manifests/init.pp +++ b/modules/buildsystem/manifests/init.pp @@ -202,21 +202,21 @@ class buildsystem { class youri_submit { include sudo - file { "/usr/local/bin/mdv-youri-submit": + file { "/usr/local/bin/mga-youri-submit": owner => root, group => root, mode => 755, - content => template("buildsystem/mdv-youri-submit") + content => template("buildsystem/mga-youri-submit") } - file { "/usr/local/bin/mdv-youri-submit.wrapper": + file { "/usr/local/bin/mga-youri-submit.wrapper": owner => root, group => root, mode => 755, - content => template("buildsystem/mdv-youri-submit.wrapper") + content => template("buildsystem/mga-youri-submit.wrapper") } - sudo::sudoers_config { "mdv-youri-submit": + sudo::sudoers_config { "mga-youri-submit": content => template("buildsystem/sudoers.youri") } diff --git a/modules/buildsystem/templates/mdv-youri-submit b/modules/buildsystem/templates/mdv-youri-submit deleted file mode 100755 index 93cc1c1e..00000000 --- a/modules/buildsystem/templates/mdv-youri-submit +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec sudo /usr/local/bin/mdv-youri-submit.wrapper "$@" diff --git a/modules/buildsystem/templates/mga-youri-submit b/modules/buildsystem/templates/mga-youri-submit new file mode 100755 index 00000000..0d29d462 --- /dev/null +++ b/modules/buildsystem/templates/mga-youri-submit @@ -0,0 +1,2 @@ +#!/bin/sh +exec sudo /usr/local/bin/mga-youri-submit.wrapper "$@" diff --git a/modules/buildsystem/templates/mdv-youri-submit.wrapper b/modules/buildsystem/templates/mga-youri-submit.wrapper index f20e3412..66fc59bc 100755 --- a/modules/buildsystem/templates/mdv-youri-submit.wrapper +++ b/modules/buildsystem/templates/mga-youri-submit.wrapper @@ -10,7 +10,7 @@ use MDK::Common; my $log_dir = "$ENV{HOME}/submit-logs"; my $sudo_user = $ENV{SUDO_USER} or die "should be run through sudo"; -my @prog = ('perl', '-I/usr/share/mdv-youri-submit/lib', '/usr/share/mdv-youri-submit/bin/youri-submit'); +my @prog = ('perl', '-I/usr/share/mga-youri-submit/lib', '/usr/share/mga-youri-submit/bin/youri-submit'); my @options; foreach my $arg (@ARGV) { diff --git a/modules/buildsystem/templates/repsys.conf b/modules/buildsystem/templates/repsys.conf index 1e95ca72..72cea909 100644 --- a/modules/buildsystem/templates/repsys.conf +++ b/modules/buildsystem/templates/repsys.conf @@ -59,7 +59,7 @@ mageia_branch = cauldron [helper] create-srpm = /usr/share/repsys/create-srpm -upload-srpm = /usr/local/bin/mdv-youri-submit +upload-srpm = /usr/local/bin/mga-youri-submit # needed by mdvsys 2.0 install-buildrequires = sudo rurpmi --auto --no-suggests diff --git a/modules/buildsystem/templates/sudoers.youri b/modules/buildsystem/templates/sudoers.youri index 0ec7ae41..f3fa35b0 100644 --- a/modules/buildsystem/templates/sudoers.youri +++ b/modules/buildsystem/templates/sudoers.youri @@ -1,4 +1,4 @@ -Cmnd_Alias YOURI = /usr/local/bin/mdv-youri-submit.wrapper +Cmnd_Alias YOURI = /usr/local/bin/mga-youri-submit.wrapper Defaults!YOURI always_set_home Defaults!YOURI runas_default = <%= sched_login %> Defaults!YOURI !requiretty |