This patch lowers some restrictions when setting disttags. With it, it
will be possible to add a '.1' disttag to a '0.fdr.1' release.


2003-12-03  Enrico Scholz  <enrico.scholz@informatik.tu-chemnitz.de>
	* rediffed

2003-11-13  Enrico Scholz  <enrico.scholz@informatik.tu-chemnitz.de>
	* created initially
--- mach.cvs/scripts/mach.in~disttag-1	2003-12-03 01:40:35.000000000 +0100
+++ mach.cvs/scripts/mach.in	2003-12-03 01:42:07.000000000 +0100
@@ -861,14 +861,14 @@
                 spec = Spec (os.path.join (self.rootdir, 'tmp', specfile))
                 release = spec.tag ("release")
                 debug ("Release of spec file to mangle is %s" % release)
-                if not release.endswith ('.' + self.config['release']):
-                    suffix=""
-                    if self.config['old-release']: suffix = "\\\\." + self.config['old-release']
-                    command = 'sed -e "s,^\\\\(Release\\\\s*:.*[^\\\\s]\\\\)%s\\\\s*$,\\\\1.%s,i" /tmp/%s > /usr/src/rpm/SPECS/%s' % (suffix, self.config['release'], specfile, specfile)
-                    debug ("mangling with %s" % command)
-                    self.do_chroot (command)
-                else:
-                    debug ("Release already contains mangle trailer %s" % self.config['release'])
+                if release.endswith (self.config['release']):
+                    warning("release '%s' contains already the wanted disttag '%s'" %
+                            (release, self.config['release']))
+                suffix=""
+                if self.config['old-release']: suffix = "\\\\." + self.config['old-release']
+                command = 'sed -e "s,^\\\\(Release\\\\s*:.*[^\\\\s]\\\\)%s\\\\s*$,\\\\1.%s,i" /tmp/%s > /usr/src/rpm/SPECS/%s' % (suffix, self.config['release'], specfile, specfile)
+                debug ("mangling with %s" % command)
+                self.do_chroot (command)
 
             # delete the original temp spec file
             command = 'rm /tmp/%s' % specfile