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

[Git][ftp-team/dak][deploy] 6 commits: Add missing import to dak rm



Title: GitLab

Ansgar Burchardt pushed to branch deploy at Debian FTP Team / dak

Commits:

3 changed files:

Changes:

  • dak/dakdb/update119.py
    ... ... @@ -64,7 +64,7 @@ def do_update(self):
    64 64
                 c.execute("DROP VIEW {0}".format(i))
    
    65 65
     
    
    66 66
             for i in sequences:
    
    67
    -            c.execute("DROP SEQUENCE {0}".format(i))
    
    67
    +            c.execute("DROP SEQUENCE IF EXISTS {0}".format(i))
    
    68 68
     
    
    69 69
             c.execute("UPDATE config SET value = '119' WHERE name = 'db_revision'")
    
    70 70
             self.db.commit()
    

  • dak/rm.py
    ... ... @@ -43,6 +43,7 @@
    43 43
     from __future__ import print_function
    
    44 44
     
    
    45 45
     import commands
    
    46
    +import functools
    
    46 47
     import os
    
    47 48
     import sys
    
    48 49
     import apt_pkg
    

  • integration-tests/tests/0001-basic
    ... ... @@ -50,6 +50,15 @@ dak admin suite-component add unstable main contrib non-free
    50 50
     )
    
    51 51
     
    
    52 52
     (
    
    53
    +  dak control-overrides -s unstable -t deb -a << EOF
    
    54
    +package required admin
    
    55
    +EOF
    
    56
    +  dak control-overrides -s unstable -t dsc -a << EOF
    
    57
    +package admin
    
    58
    +EOF
    
    59
    +)
    
    60
    +
    
    61
    +(
    
    53 62
       packages=${DAK_ROOT:?}/tests/fixtures/packages
    
    54 63
       ln -sf ${packages:?}/gpg/pubring.gpg ${DAKBASE:?}/keyrings/upload-keyring.gpg
    
    55 64
       dak import-keyring -U "%s" ${DAKBASE}/keyrings/upload-keyring.gpg
    
    ... ... @@ -69,3 +78,7 @@ dak admin suite-component add unstable main contrib non-free
    69 78
       # TODO: make this work in the CI; needs GnuPG key
    
    70 79
       #dak generate-release -s unstable
    
    71 80
     )
    
    81
    +
    
    82
    +(
    
    83
    +  dak rm -n -s unstable package
    
    84
    +)


  • Reply to: