diff --git a/generate-reminder.pl b/generate-reminder.pl index 7822650d..67604bfc 100644 --- a/generate-reminder.pl +++ b/generate-reminder.pl @@ -103,7 +103,7 @@ sub explain_request($$) my $target = $action->{target}; if ($target->{project} eq $tproject) { - print "ignore $request->{id}\n"; + #print "ignore $request->{id}\n"; next; } diff --git a/osc-checker.py b/osc-checker.py index bc18c1cf..e19655e5 100644 --- a/osc-checker.py +++ b/osc-checker.py @@ -223,10 +223,11 @@ def _checker_one_request(self, rq, cmd, opts): tprj, tpkg) dpkg = self._checker_check_devel_package(opts, tprj, tpkg) self._devel_projects['X11:QtDesktop/'] = 'rabbitmq' - self._devel_projects['GNOME:Cinnamon/'] = 'ruby19' + self._devel_projects['devel:languages:erlang/'] = 'ruby19' self._devel_projects['devel:languages:nodejs/'] = 'nodejs' - self._devel_projects['Publishing:TeXLive/'] = 'texlive' + self._devel_projects['X11:Enlightenment:Factory/'] = 'x2go' self._devel_projects['isv:ownCloud:owncloud-factory'] = 'owncloud' + self._devel_projects['X11:Wayland/'] = 'wayland' if dpkg: [dprj, dpkg] = dpkg.split('/') else: diff --git a/source-checker.pl b/source-checker.pl index c1833be9..5199e981 100644 --- a/source-checker.pl +++ b/source-checker.pl @@ -1,7 +1,7 @@ #! /usr/bin/perl use File::Basename; -use File::Temp qw/ :mktemp /; +use File::Temp qw/ tempdir /; use XML::Simple; use Data::Dumper; use Cwd; @@ -18,6 +18,12 @@ if (-f "$dir/_service") { print "Services are only allowed if they are mode='localonly'. Please change the mode of $name and use osc service localrun\n"; exit(1); } + # now remove it to have full service from source validator + unlink("$dir/_service"); +} + +if (-f "$dir/_constraints") { + unlink("$dir/_constraints"); } if (! -f "$dir/$bname.changes") { @@ -138,8 +144,8 @@ if (-d "_old") { } my $odir = getcwd; -my $tmpdir = mkdtemp("/tmp/obs-XXXXXXX"); -chdir($dir); +my $tmpdir = tempdir ( "obs-XXXXXXX", TMPDIR => 1 ); +chdir($dir) || die 'tempdir failed'; if (system("/usr/lib/obs/service/download_files","--enforceupstream", "yes", "--enforcelocal", "yes", "--outdir", $tmpdir)) { print "Source URLs are not valid. Try \"osc service localrun download_files\"\n"; exit(1);