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

[Git][ftp-team/dak][deploy] 4 commits: No more win32-loader during pointrelease



Title: GitLab

Joerg Jaspert pushed to branch deploy at Debian FTP Team / dak

Commits:

  • 03ebee96
    by Joerg Jaspert at 2025-09-06T12:53:38+02:00
    No more win32-loader during pointrelease
    
  • cc816f42
    by Paul Tagliamonte at 2025-09-08T23:59:51-04:00
    Prevent trailing commas from breaking dak rm logic
    
    This is all documented in #1114691 in the BTS
    
    When we do a dak rm, dak will load the archive dependencies to detect
    breakage. It does this by SELECT-ing source_metadata (basically, the
    keys from a parsed deb822 dsc), source (the source version itself),
    and newest_src_association (newest source for a sutie).
    
    This means that sources containing both Build-Depends and
    Build-Depends-Indep, and the first value to be returned contains a
    trailing space, we wind up with two commas.
    
    I'm sure everyone's guessed by now, but just to spell it out, While
    "foo," is accepted by the Python apt_pkg module, "foo,, bar" is not.
    
    Since ",," is universally regarded as broken, we don't need to worry
    about multiple trailing commas, so a straight replace should solve this
    issue, even if it's a bit .... inelegant
    
  • a476780f
    by Joerg Jaspert at 2025-09-18T20:47:10+00:00
    Merge branch 'paultag/replace' into 'master'
    
    Prevent trailing commas from breaking dak rm logic
    
    See merge request ftp-team/dak!296
  • b45e4723
    by Joerg Jaspert at 2025-09-18T22:49:24+02:00
    Merge branch 'master' into deploy
    
    * master:
      Prevent trailing commas from breaking dak rm logic
      No more win32-loader during pointrelease
    

2 changed files:

Changes:

  • config/debian/pointrelease
    ... ... @@ -307,18 +307,6 @@ if [[ -n ${diver} ]]; then
    307 307
         cd $ftpdir/dists/${suite}
    
    308 308
     fi
    
    309 309
     
    
    310
    -log "Checking for win32-loader"
    
    311
    -echo "If anything for win32-loader, enter any string, otherwise empty"
    
    312
    -read -e -p "win32-loader?" win32loader
    
    313
    -if [[ -n ${win32loader} ]]; then
    
    314
    -    cd ${ftpdir}/tools/win32-loader
    
    315
    -    if [ -d ${pusuite} ]; then
    
    316
    -        rm -r ${suite}
    
    317
    -        mv ${pusuite} ${suite}
    
    318
    -    fi
    
    319
    -    cd ${ftpdir}
    
    320
    -fi
    
    321
    -
    
    322 310
     log "Updating version numbers in readmes, fixing Changelog"
    
    323 311
     cd ${ftpdir}/dists/${suite}
    
    324 312
     
    

  • daklib/utils.py
    ... ... @@ -1308,7 +1308,7 @@ def check_reverse_depends(
    1308 1308
         }
    
    1309 1309
         statement = sql.text(
    
    1310 1310
             """
    
    1311
    -        SELECT s.source, string_agg(sm.value, ', ') as build_dep
    
    1311
    +        SELECT s.source, replace(string_agg(trim(sm.value), ', '), ',,', ',') as build_dep
    
    1312 1312
                FROM source s
    
    1313 1313
                JOIN source_metadata sm ON s.id = sm.src_id
    
    1314 1314
                WHERE s.id in
    


  • Reply to: