diff options
| -rwxr-xr-x | mini-dinstall | 19 | ||||
| -rw-r--r-- | minidinstall/misc.py | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/mini-dinstall b/mini-dinstall index e35ffb4..9a34624 100755 --- a/mini-dinstall +++ b/mini-dinstall @@ -34,14 +34,14 @@ from minidinstall.GPGSigVerifier import * from minidinstall.version import * from minidinstall import misc, mail, tweet -debchanges_re = re.compile('([-a-z0-9+.]+)_(.+?)_([-a-zA-Z0-9]+)\.changes$') -debpackage_re = re.compile('([-a-z0-9+.]+)_(.+?)_([-a-zA-Z0-9]+)\.(d|u)?deb$') -debbuildinfo_re = re.compile('([-a-z0-9+.]+)_(.+?)_([-a-zA-Z0-9]+)\.buildinfo$') -debsrc_dsc_re = re.compile('([-a-z0-9+.]+)_(.+?)\.dsc$') -debsrc_diff_re = re.compile('([-a-z0-9+.]+)_(.+?)\.diff\.gz$') -debsrc_orig_re = re.compile('([-a-z0-9+.]+)_(.+?)\.orig[-a-z0-9]*\.tar\.(gz|bz2|lzma|xz)(\.asc)?$') -debsrc_native_re = re.compile('([-a-z0-9+.]+)_(.+?)\.tar\.(gz|bz2|lzma|xz)$') -native_version_re = re.compile('\s*.*-') +debchanges_re = re.compile('([-a-z0-9+.]+)_(.+?)_([-a-zA-Z0-9]+)\\.changes$') +debpackage_re = re.compile('([-a-z0-9+.]+)_(.+?)_([-a-zA-Z0-9]+)\\.(d|u)?deb$') +debbuildinfo_re = re.compile('([-a-z0-9+.]+)_(.+?)_([-a-zA-Z0-9]+)\\.buildinfo$') +debsrc_dsc_re = re.compile('([-a-z0-9+.]+)_(.+?)\\.dsc$') +debsrc_diff_re = re.compile('([-a-z0-9+.]+)_(.+?)\\.diff\\.gz$') +debsrc_orig_re = re.compile('([-a-z0-9+.]+)_(.+?)\\.orig[-a-z0-9]*\\.tar\\.(gz|bz2|lzma|xz)(\\.asc)?$') +debsrc_native_re = re.compile('([-a-z0-9+.]+)_(.+?)\\.tar\\.(gz|bz2|lzma|xz)$') +native_version_re = re.compile('\\s*.*-') toplevel_directory = None tmp_new_suffix = '.dinstall-new' @@ -1524,7 +1524,8 @@ class FlatArchiveDirIndexer(ArchiveDirIndexer): f.write('ButAutomaticUpgrades: yes\n') f.write('Date: %s\n' % time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime())) if self._expire_release_files or self._keyids: - f.write('Valid-Until: %s\n' % (datetime.datetime.utcnow() + datetime.timedelta(days=28)).strftime("%a, %d %b %Y %H:%M:%S UTC")) + f.write('Valid-Until: %s\n' % (datetime.datetime.now(datetime.timezone.utc) + + datetime.timedelta(days=28)).strftime("%a, %d %b %Y %H:%M:%S UTC")) f.write('Architectures: %s\n' % ' '.join(self._arches)) if self._keyids: f.write('Signed-By: %s\n' % ','.join(self._keyids)) diff --git a/minidinstall/misc.py b/minidinstall/misc.py index 5f7fb71..4c72ceb 100644 --- a/minidinstall/misc.py +++ b/minidinstall/misc.py @@ -37,7 +37,7 @@ def dup2(fd, fd2): def format_changes(L): """ remove changelog header and all lines with only a dot """ - dotmatch = re.compile('^\.$') + dotmatch = re.compile('^\\.$') L1 = [] for x in L[3:]: |