[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][snapshot-team/snapshot][master] 2 commits: Don't shell out to uuidgen

Title: GitLab

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:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -29,7 +29,6 @@ before_script:
    29 29 
         debhelper
    30 30 
         ruby
    31 31 
         ruby-pg
    32 
    -    uuid-runtime
    33 32 
         devscripts
    34 33 
         $ADDITIONAL_PACKAGES
    35 34

  • README
    ... ... @@ -151,7 +151,7 @@ Dependencies
    151 151
    152 152 
     (Target: bullseye)
    153 153
    154 
    -Depends: ruby ruby-pg python3-yaml python3-psycopg2 fuse-utils python3-fuse uuid-runtime
    154 
    +Depends: ruby ruby-pg python3-yaml python3-psycopg2 fuse-utils python3-fuse
    155 155 
     DB-Depends: postgresql-plperl-13 postgresql-13-debversion
    156 156 
     fsck-Depends: python3-dev gcc
    157 157 
     FUSE-Depends: python3-fuse

  • snapshot
    ... ... @@ -29,6 +29,7 @@ require 'digest/sha1'
    29 29 
     require 'digest/md5'
    30 30 
     require 'fileutils'
    31 31 
     require 'time'
    32 
    +require 'securerandom'
    32 33
    33 34 
     def barf(str)
    34 35 
     	if $logger.nil?
    ... ... @@ -665,7 +666,7 @@ class SnapshotImporter
    665 666
    666 667 
     	def _insert_mirrorrun(archive_id, date, uuid=nil, importing_host=nil)
    667 668 
     		date = date.nil? ? Time.new() : Time.parse(date)
    668 
    -		uuid=`uuidgen`.chomp if uuid.nil?
    669 
    +		uuid=SecureRandom.uuid if uuid.nil?
    669 670 
     		importing_host=`hostname -f`.chomp if importing_host.nil?
    670 671
    671 672 
     		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:
    65 65
    66 66 
     ```bash
    67 67 
     sudo apt install tox aptly devscripts postgresql-13-debversion \
    68 
    -    postgresql-plperl ruby ruby-pg uuid-runtime
    68 
    +    postgresql-plperl ruby ruby-pg
    69 69 
     ```
    70 70
    71 71 
     To run snapshot test suite, execute:

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: