diff options
| author | Michael Scherer <misc@mageia.org> | 2012-01-08 17:09:21 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-01-08 17:09:21 +0000 |
| commit | 9e27fe5a3136920013a1eda4de56e9c98616173e (patch) | |
| tree | 137a986d206c0e94e2feddb9c8714b798c0c6c3b /modules/buildsystem | |
| parent | 8e82df22c9b3ef2cd12f498696b9faeaf41c6791 (diff) | |
| download | puppet-9e27fe5a3136920013a1eda4de56e9c98616173e.tar puppet-9e27fe5a3136920013a1eda4de56e9c98616173e.tar.gz puppet-9e27fe5a3136920013a1eda4de56e9c98616173e.tar.bz2 puppet-9e27fe5a3136920013a1eda4de56e9c98616173e.tar.xz puppet-9e27fe5a3136920013a1eda4de56e9c98616173e.zip | |
no need for a variable since this is used only once in a script
Diffstat (limited to 'modules/buildsystem')
| -rw-r--r-- | modules/buildsystem/manifests/init.pp | 1 | ||||
| -rwxr-xr-x | modules/buildsystem/templates/submit_package.pl | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp index 0d471350..ba042d35 100644 --- a/modules/buildsystem/manifests/init.pp +++ b/modules/buildsystem/manifests/init.pp @@ -9,7 +9,6 @@ class buildsystem { $repository_root = "/distrib/bootstrap" $packagers_group = 'mga-packagers' $packagers_committers_group = 'mga-packagers-committers' - $createsrpm_path = '/usr/share/mgarepo/create-srpm' include ssh::auth ssh::auth::key { $build_login: # declare a key for build bot: RSA, 2048 bits diff --git a/modules/buildsystem/templates/submit_package.pl b/modules/buildsystem/templates/submit_package.pl index 3a34591b..daeec962 100755 --- a/modules/buildsystem/templates/submit_package.pl +++ b/modules/buildsystem/templates/submit_package.pl @@ -4,7 +4,6 @@ use warnings; my $svn_server = 'svn.<%= domain %>'; my $packagersgroup="<%= packagers_group %>"; -my $createsrpm="<%= createsrpm_path %>"; my $login = getpwuid($<); my (undef, undef, undef, $members) = getgrnam $packagersgroup; @@ -16,4 +15,4 @@ if (not $members =~ /\b$login\b/) { # for bug 914 # https://bugs.mageia.org/show_bug.cgi?id=914 map { $_ =~ s|^svn\+ssh://$svn_server/|svn://$svn_server/| } @ARGV; -exec $createsrpm , @ARGV; +exec "/usr/share/mgarepo/create-srpm", @ARGV; |