Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/145573
Change subject: labsdebrepo: Fix initial run
......................................................................
labsdebrepo: Fix initial run
Currently, Packages.gz is initialized as an empty file. This makes
"apt-get update" croak until a package is added to the repository and
Packages.gz regenerated.
This change generates the initial Packages.gz by running
dpkg-scanpackages on the empty directory instead.
Change-Id: I1fd0d090cfb444e5cbd2e83259cfc3df04dddd3f
---
M manifests/misc/labsdebrepo.pp
1 file changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/145573/1
diff --git a/manifests/misc/labsdebrepo.pp b/manifests/misc/labsdebrepo.pp
index 1157c29..71eaffb 100644
--- a/manifests/misc/labsdebrepo.pp
+++ b/manifests/misc/labsdebrepo.pp
@@ -6,9 +6,6 @@
file { '/data/project/repo':
ensure => directory,
}
- file { '/data/project/repo/Packages.gz':
- ensure => present,
- }
# run dpkg-scanpackages . /dev/null | gzip -9c > binary/Packages.gz
# dpkg-scanpackages is in dpkg-dev
package { 'dpkg-dev':
@@ -17,8 +14,9 @@
exec { 'Turn dir into deb repo':
cwd => '/data/project/repo',
command => '/usr/bin/dpkg-scanpackages . /dev/null | gzip -9c >
Packages.gz',
- # only run if Packages.gz is *not* the newest file in the directory
- onlyif => '/usr/bin/test $(find . -newer Packages.gz | wc -l) -gt 0',
+ # Only run if Packages.gz is *not* the newest file in the
+ # directory or doesn't exist at all.
+ onlyif => '/usr/bin/test ! -e Packages.gz -o $(find . -newer
Packages.gz | wc -l) -gt 0',
require => [Package['dpkg-dev'], File['/data/project/repo']],
}
# add the dir-turned-repo to sources.list
--
To view, visit https://gerrit.wikimedia.org/r/145573
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1fd0d090cfb444e5cbd2e83259cfc3df04dddd3f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
