Julien Cristau pushed to branch master at snapshot / snapshot
Commits:
9c8ce874 by Julien Cristau at 2024-04-06T19:08:58+02:00
Don't shell out to uuidgen
- - - - -
d0def288 by Julien Cristau at 2024-04-10T08:31:37+00:00
Merge branch 'uuidgen' into 'master'
Don't shell out to uuidgen
See merge request snapshot-team/snapshot!16
- - - - -
4 changed files:
- .gitlab-ci.yml
- README
- snapshot
- web/app/docs/deploy.md
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -29,7 +29,6 @@ before_script:
debhelper
ruby
ruby-pg
- uuid-runtime
devscripts
$ADDITIONAL_PACKAGES
=====================================
README
=====================================
@@ -151,7 +151,7 @@ Dependencies
(Target: bullseye)
-Depends: ruby ruby-pg python3-yaml python3-psycopg2 fuse-utils python3-fuse
uuid-runtime
+Depends: ruby ruby-pg python3-yaml python3-psycopg2 fuse-utils python3-fuse
DB-Depends: postgresql-plperl-13 postgresql-13-debversion
fsck-Depends: python3-dev gcc
FUSE-Depends: python3-fuse
=====================================
snapshot
=====================================
@@ -29,6 +29,7 @@ require 'digest/sha1'
require 'digest/md5'
require 'fileutils'
require 'time'
+require 'securerandom'
def barf(str)
if $logger.nil?
@@ -665,7 +666,7 @@ class SnapshotImporter
def _insert_mirrorrun(archive_id, date, uuid=nil, importing_host=nil)
date = date.nil? ? Time.new() : Time.parse(date)
- uuid=`uuidgen`.chomp if uuid.nil?
+ uuid=SecureRandom.uuid if uuid.nil?
importing_host=`hostname -f`.chomp if importing_host.nil?
mirrorrun_id = @db.insert_row('mirrorrun',
{'archive_id'=>archive_id, 'run'=>date.to_s, 'mirrorrun_uuid'=>uuid,
'importing_host'=>importing_host})['mirrorrun_id']
=====================================
web/app/docs/deploy.md
=====================================
@@ -65,7 +65,7 @@ Install testing dependencies:
```bash
sudo apt install tox aptly devscripts postgresql-13-debversion \
- postgresql-plperl ruby ruby-pg uuid-runtime
+ postgresql-plperl ruby ruby-pg
```
To run snapshot test suite, execute:
View it on GitLab:
https://salsa.debian.org/snapshot-team/snapshot/-/compare/37cd1629baeb1fceb71ec4d8741465365c64db5f...d0def2887599c0f64fd7b397c4b566867388a575
--
View it on GitLab:
https://salsa.debian.org/snapshot-team/snapshot/-/compare/37cd1629baeb1fceb71ec4d8741465365c64db5f...d0def2887599c0f64fd7b397c4b566867388a575
You're receiving this email because of your account on salsa.debian.org.
