From 87af55faa7a169572abd62c52df4b4aa5a43b3c3 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 24 Mar 2018 23:37:16 +0000
Subject: Initial code

---
 qarepo.pl | 361 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 361 insertions(+)
 create mode 100644 qarepo.pl

diff --git a/qarepo.pl b/qarepo.pl
new file mode 100644
index 0000000..877602c
--- /dev/null
+++ b/qarepo.pl
@@ -0,0 +1,361 @@
+#!/usr/bin/perl
+
+use strict;
+use Gtk3 '-init';
+use Glib qw(TRUE FALSE);
+use MDK::Common;
+
+my $home = $ENV{HOME} or die "ERROR: the HOME environment variable is not set.\n";
+
+my $sudo = $> ? 'sudo' : '';
+
+my %config;
+
+my $config_file = $home . '/.qareporc';
+if (open(my $f, '<', $config_file)) {
+    while (my $line = <$f>) {
+        chomp($line);
+        my ($key, $value) = split(/=/, $line);
+        $config{$key} = $value if $key;
+    }
+    close($f);
+}
+
+my $mirror  = $config{MIRROR}  || 'rsync://mirrors.kernel.org/mirrors/mageia';
+my $version = $config{VERSION} || '6';
+my $arch    = $config{ARCH}    || 'x86_64';
+my $qa_repo = $config{QA_REPO} || $home . '/qa-testing';
+
+my $qa_repo_name = 'QA Testing';
+
+my $list_url = `urpmq --list-url | grep '$qa_repo_name'`;
+chomp($list_url);
+
+my $active_qa_repo = $list_url =~ s/$qa_repo_name +//r;
+if ($list_url && $active_qa_repo ne $qa_repo) {
+    disable_repo();
+}
+my $last_version = $version;
+my $last_arch    = $arch;
+
+my $window = Gtk3::Window->new('toplevel');
+
+my $grid = Gtk3::Grid->new();
+
+my $label1 = Gtk3::Label->new('Mirror:');
+my $entry1 = Gtk3::Entry->new();
+
+my $label2 = Gtk3::Label->new('Version:');
+my $entry2 = Gtk3::Entry->new();
+
+my $label3 = Gtk3::Label->new('Arch:');
+my $entry3 = Gtk3::ComboBoxText->new();
+
+my $label4 = Gtk3::Label->new('QA Repo:');
+my $entry4 = Gtk3::Entry->new();
+
+my $label5 = Gtk3::Label->new('RPMs:');
+my $entry5 = Gtk3::TextView->new();
+
+my $scroll = Gtk3::ScrolledWindow->new();
+
+my $button1 = Gtk3::Button->new('Quit');
+my $button2 = Gtk3::Button->new($active_qa_repo ? 'Disable' : 'Enable');
+my $button3 = Gtk3::Button->new('Update');
+my $button4 = Gtk3::Button->new('Clear');
+
+$window->set_title('QA Repo');
+$window->set_default_size(500, 300);
+$window->set_border_width(10);
+$window->signal_connect(delete_event => \&quit);
+
+$grid->set_row_spacing(10);
+$grid->set_column_spacing(10);
+
+$label1->set_halign('GTK_ALIGN_END');
+
+$entry1->set_text($mirror);
+$entry1->set_hexpand(TRUE);
+$entry1->signal_connect(changed => \&changed);
+
+$label2->set_halign('GTK_ALIGN_END');
+
+$entry2->set_text($version);
+$entry2->set_hexpand(FALSE);
+$entry2->signal_connect(changed => \&changed);
+
+$label3->set_halign('GTK_ALIGN_END');
+
+$entry3->append_text('i586');
+$entry3->append_text('x86_64');
+if ($arch eq 'x86_64') {
+    $entry3->set_active(1);
+} else {
+    $entry3->set_active(0);
+}
+$entry3->signal_connect(changed => \&changed);
+
+$label4->set_halign('GTK_ALIGN_END');
+
+$entry4->set_text($qa_repo);
+$entry4->set_hexpand(TRUE);
+$entry4->signal_connect(changed => \&changed);
+
+$label5->set_valign('GTK_ALIGN_START');
+$label5->set_halign('GTK_ALIGN_END');
+
+$entry5->get_buffer->set_text(join("\n", get_existing_rpms()));
+$entry5->get_buffer->signal_connect(changed => \&changed);
+
+$scroll->set_hexpand(TRUE);
+$scroll->set_vexpand(TRUE);
+
+$scroll->add($entry5);
+
+$button1->signal_connect(clicked => \&quit);
+
+$button2->signal_connect(clicked => \&enable_disable);
+
+$button3->signal_connect(clicked => \&update);
+$button3->set_valign('GTK_ALIGN_START');
+$button3->set_sensitive(FALSE);
+
+$button4->signal_connect(clicked => \&clear);
+$button4->set_valign('GTK_ALIGN_END');
+
+$grid->attach($label1, 0, 0, 1, 1);
+$grid->attach($entry1, 1, 0, 4, 1);
+$grid->attach($label2, 1, 1, 1, 1);
+$grid->attach($entry2, 2, 1, 1, 1);
+$grid->attach($label3, 3, 1, 1, 1);
+$grid->attach($entry3, 4, 1, 1, 1);
+$grid->attach($label4, 0, 2, 1, 1);
+$grid->attach($entry4, 1, 2, 4, 1);
+$grid->attach($label5, 0, 3, 1, 1);
+$grid->attach($scroll, 1, 3, 4, 2);
+
+$grid->attach($button1, 5, 0, 1, 1);
+$grid->attach($button2, 5, 2, 1, 1);
+$grid->attach($button3, 5, 3, 1, 1);
+$grid->attach($button4, 5, 4, 1, 1);
+
+$window->add($grid);
+$window->show_all;
+
+Gtk3->main;
+
+my $ignore_change;
+
+sub changed() {
+    if ($ignore_change) {
+        $ignore_change = 0;
+    } else {
+        $button3->set_sensitive(TRUE);
+    }
+}
+
+sub quit() {
+    get_settings();
+    if (open(my $f, '>', $config_file)) {
+        print $f "MIRROR=$mirror\n";
+        print $f "VERSION=$version\n";
+        print $f "ARCH=$arch\n";
+        print $f "QA_REPO=$qa_repo\n";
+        close($f);
+    }
+    Gtk3->main_quit;
+}
+
+sub enable_disable() {
+    disable_buttons();
+    if ($active_qa_repo) {
+        disable_repo();
+    } else {
+        get_settings();
+        if (sync_repo()) {
+            enable_repo();
+        }
+    }
+    enable_buttons();
+}
+
+sub update() {
+    disable_buttons();
+    get_settings();
+    if (sync_repo()) {
+        if ($active_qa_repo) {
+            update_repo();
+        } else {
+            enable_repo();
+        }
+    } else {
+        if ($active_qa_repo) {
+            disable_repo();
+        }
+    }
+    enable_buttons();
+}
+
+my $clear_pending;
+
+sub clear() {
+    disable_buttons();
+    get_settings();
+    clear_repo();
+    if ($active_qa_repo) {
+        disable_repo();
+    }
+    my $buffer = $entry5->get_buffer();
+    $ignore_change = $buffer->get_char_count() > 0;
+    $buffer->set_text("");
+    enable_buttons();
+}
+
+sub disable_buttons() {
+    $button1->set_sensitive(FALSE);
+    $button2->set_sensitive(FALSE);
+    $button3->set_sensitive(FALSE);
+    $button4->set_sensitive(FALSE);
+}
+
+sub enable_buttons() {
+    $button1->set_sensitive(TRUE);
+    $button2->set_sensitive(TRUE);
+    $button4->set_sensitive(TRUE);
+}
+
+sub get_settings() {
+    $mirror  = $entry1->get_text();
+    $version = $entry2->get_text();
+    $arch    = $entry3->get_active_text();
+    $qa_repo = $entry4->get_text();
+    if ($active_qa_repo && $active_qa_repo ne $qa_repo) {
+        disable_repo();
+    }
+}
+
+sub get_required_rpms() {
+    my $buffer = $entry5->get_buffer();
+    my $start  = $buffer->get_start_iter();
+    my $end    = $buffer->get_end_iter();
+
+    grep { $_ ne '' } split("\n", $buffer->get_text($start, $end, FALSE));
+}
+
+sub get_existing_rpms() {
+    map { basename($_) } glob("$qa_repo/*.rpm");
+}
+
+sub disable_repo() {
+    system("$sudo urpmi.removemedia '$qa_repo_name'") == 0
+      or die "ERROR: couldn't disable the $qa_repo_name media.\n";
+    $button2->set_label('Enable');
+    $active_qa_repo = '';
+}
+
+sub enable_repo() {
+    if (system("$sudo urpmi.addmedia --update '$qa_repo_name' $qa_repo") == 0) {
+        $button2->set_label('Disable');
+        $active_qa_repo = $qa_repo;
+    } else {
+        $active_qa_repo = '';
+    }
+}
+
+sub update_repo() {
+    if (system("$sudo urpmi.update '$qa_repo_name'") != 0) {
+        print "ERROR: couldn't update the $qa_repo_name media.\n";
+        disable_repo();
+    }
+}
+
+sub clear_repo() {
+    my @existing_rpms = get_existing_rpms();
+    if (@existing_rpms) {
+        unlink(map { "$qa_repo/$_" } @existing_rpms)
+          or die "ERROR: couldn't delete/unlink existing RPMs in the QA repo.\n";
+    }
+}
+
+my $sync_ok;
+
+sub sync_repo() {
+    my $sync_file;
+    if      ($mirror =~ /^rsync:/) {
+        $sync_file = \&sync_file_rsync;
+    } elsif ($mirror =~ /^ftp:/ || $mirror =~ /^http:/) {
+        $sync_file = \&sync_file_aria2;
+    } elsif ($mirror !~ /^\w+:/) {
+        $sync_file = \&sync_file_link;
+    } else {
+        sync_error("unsupported mirror URL type");
+        return 0;
+    }
+
+    if ($version ne $last_version || $arch ne $last_arch) {
+        clear_repo();
+    }
+
+    my @required_rpms = get_required_rpms();
+    my @existing_rpms = get_existing_rpms();
+    my @unwanted_rpms = difference2(\@existing_rpms, \@required_rpms);
+    if (@unwanted_rpms) {
+        unlink(map { "$qa_repo/$_" } @unwanted_rpms)
+          or die "ERROR: couldn't delete/unlink unwanted RPMs in the QA repo.\n";
+    }
+    my $old_pubkey = "$qa_repo/media_info/pubkey";
+    if (-e $old_pubkey) {
+        unlink($old_pubkey)
+          or die "ERROR: couldn't delete/unlink old pubkey in the QA repo.\n";
+    }
+
+    mkdir_p("$qa_repo/media_info/");
+
+    $sync_ok = 1;
+    my $remote_repo = $mirror . '/distrib/' . $version . '/' . $arch . '/media';
+    foreach my $rpm (difference2(\@required_rpms, \@existing_rpms)) {
+        my $remote_url = $remote_repo;
+        if ($rpm =~ /tainted/) {
+            $remote_url .= '/tainted/updates_testing/' . $rpm;
+        } elsif ($rpm =~ /nonfree/) {
+            $remote_url .= '/nonfree/updates_testing/' . $rpm;
+        } else {
+            $remote_url .= '/core/updates_testing/' . $rpm;
+        }
+        &$sync_file($remote_url, $qa_repo);
+    }
+    &$sync_file($remote_repo . '/core/updates_testing/media_info/pubkey', $qa_repo . '/media_info');
+
+    if ($sync_ok) {
+        system("genhdlist2 $qa_repo") == 0
+          or sync_error("failed to update hdlist");
+    }
+
+    $sync_ok;
+}
+
+sub sync_file_rsync {
+    my ($src_url, $dst_dir) = @_;
+    print "fetching $src_url\n";
+    system("rsync -q $src_url $dst_dir") == 0
+      or sync_error("failed to download $src_url");
+}
+
+sub sync_file_aria2 {
+    my ($src_url, $dst_dir) = @_;
+    print "fetching $src_url\n";
+    system("aria2c -q -d $dst_dir $src_url") == 0
+      or sync_error("failed to download $src_url");
+}
+
+sub sync_file_link {
+    my ($src_file, $dst_dir) = @_;
+    -e $src_file && symlink($src_file, $dst_dir . '/' . basename($src_file))
+      or sync_error("failed to link $src_file");
+}
+
+sub sync_error {
+    my ($message) = @_;
+    print "ERROR: $message.\n";
+    $sync_ok = 0;
+}
-- 
cgit v1.2.1


From 38a9c88e36fe3fa45b4192efd73d890c1ad17201 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 27 Mar 2018 23:25:43 +0100
Subject: New release

So, following initial feedback, I've made a few changes:

 - incomplete names and simple wildcards (? and *) are accepted in
   the RPMs box

 - the Clear button just clears the RPMs box (use the Update button
   to clear the local repo as well)

 - the current status is shown, which can be one of

    Enabled       : 'QA Testing' is enabled in the urpmi media and the
                    local repo contains what you see in the GUI

    Needs update  : 'QA Testing' is enabled in the urpmi media, but the
                    local repo is out of sync with what you see

    Updating      : what it says

    Update failed : one or more of the requested RPMs couldn't be fetched
                    from the remote repo (or some other error occurred).
                    You can try updating again in case it was a temporary
                    download error

    Disabled      : 'QA Testing' has been removed from the urpmi media
                    (but the local repo remains intact)

 - the dual-function button is now Enable/Update, depending on the current
   status (this should all become clear when you use the app.). In reality
   it does exactly the same thing in both cases - it's just another visual
   clue to show whether or not the local repo is in sync
---
 LICENSE   | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 qarepo.pl | 271 +++++++++++++++++++++++++++++++++++--------------
 2 files changed, 535 insertions(+), 75 deletions(-)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/qarepo.pl b/qarepo.pl
index 877602c..957ce12 100644
--- a/qarepo.pl
+++ b/qarepo.pl
@@ -1,17 +1,57 @@
 #!/usr/bin/perl
 
+# Copyright (C) 2018 Mageia
+#                    Martin Whitaker <mageia@martin-whitaker.me.uk>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
+
 use strict;
-use Gtk3 '-init';
+use warnings;
+
+use File::Temp qw(tmpnam);
 use Glib qw(TRUE FALSE);
+use Gtk3 '-init';
 use MDK::Common;
 
+my $release = 'v1.1';
+
+###############################################################################
+# States and Status
+###############################################################################
+
+my %status_text = (
+    disabled => 'Disabled',
+    enabled  => 'Enabled',
+    changed  => 'Needs update',
+    failed   => 'Update failed'
+);
+
+my $state;
+
+###############################################################################
+# Initial Configuration
+###############################################################################
+
 my $home = $ENV{HOME} or die "ERROR: the HOME environment variable is not set.\n";
 
+# Only use sudo if not run by root.
 my $sudo = $> ? 'sudo' : '';
 
 my %config;
 
-my $config_file = $home . '/.qareporc';
+my $config_file = "$home/.qareporc";
 if (open(my $f, '<', $config_file)) {
     while (my $line = <$f>) {
         chomp($line);
@@ -24,20 +64,26 @@ if (open(my $f, '<', $config_file)) {
 my $mirror  = $config{MIRROR}  || 'rsync://mirrors.kernel.org/mirrors/mageia';
 my $version = $config{VERSION} || '6';
 my $arch    = $config{ARCH}    || 'x86_64';
-my $qa_repo = $config{QA_REPO} || $home . '/qa-testing';
+my $qa_repo = $config{QA_REPO} || "$home/qa-testing";
 
 my $qa_repo_name = 'QA Testing';
 
-my $list_url = `urpmq --list-url | grep '$qa_repo_name'`;
-chomp($list_url);
+my $repo_name_and_url = `urpmq --list-url | grep '$qa_repo_name '`;
+chomp($repo_name_and_url);
+
+my $active_qa_repo = $repo_name_and_url =~ s/$qa_repo_name +//r;
 
-my $active_qa_repo = $list_url =~ s/$qa_repo_name +//r;
-if ($list_url && $active_qa_repo ne $qa_repo) {
+if ($repo_name_and_url && $active_qa_repo ne $qa_repo) {
     disable_repo();
 }
+
 my $last_version = $version;
 my $last_arch    = $arch;
 
+###############################################################################
+# GUI
+###############################################################################
+
 my $window = Gtk3::Window->new('toplevel');
 
 my $grid = Gtk3::Grid->new();
@@ -59,13 +105,16 @@ my $entry5 = Gtk3::TextView->new();
 
 my $scroll = Gtk3::ScrolledWindow->new();
 
+my $label6 = Gtk3::Label->new('Status:');
+my $status = Gtk3::Label->new('');
+
 my $button1 = Gtk3::Button->new('Quit');
-my $button2 = Gtk3::Button->new($active_qa_repo ? 'Disable' : 'Enable');
-my $button3 = Gtk3::Button->new('Update');
+my $button2 = Gtk3::Button->new('Disable');
+my $button3 = Gtk3::Button->new('Enable');
 my $button4 = Gtk3::Button->new('Clear');
 
-$window->set_title('QA Repo');
-$window->set_default_size(500, 300);
+$window->set_title("QA Repo  $release");
+$window->set_default_size(600, 400);
 $window->set_border_width(10);
 $window->signal_connect(delete_event => \&quit);
 
@@ -109,16 +158,18 @@ $entry5->get_buffer->signal_connect(changed => \&changed);
 
 $scroll->set_hexpand(TRUE);
 $scroll->set_vexpand(TRUE);
-
 $scroll->add($entry5);
 
+$label6->set_halign('GTK_ALIGN_END');
+
+$status->set_halign('GTK_ALIGN_START');
+
 $button1->signal_connect(clicked => \&quit);
 
-$button2->signal_connect(clicked => \&enable_disable);
+$button2->signal_connect(clicked => \&disable);
 
-$button3->signal_connect(clicked => \&update);
+$button3->signal_connect(clicked => \&enable);
 $button3->set_valign('GTK_ALIGN_START');
-$button3->set_sensitive(FALSE);
 
 $button4->signal_connect(clicked => \&clear);
 $button4->set_valign('GTK_ALIGN_END');
@@ -133,6 +184,8 @@ $grid->attach($label4, 0, 2, 1, 1);
 $grid->attach($entry4, 1, 2, 4, 1);
 $grid->attach($label5, 0, 3, 1, 1);
 $grid->attach($scroll, 1, 3, 4, 2);
+$grid->attach($label6, 0, 5, 1, 1);
+$grid->attach($status, 1, 5, 4, 1);
 
 $grid->attach($button1, 5, 0, 1, 1);
 $grid->attach($button2, 5, 2, 1, 1);
@@ -140,21 +193,26 @@ $grid->attach($button3, 5, 3, 1, 1);
 $grid->attach($button4, 5, 4, 1, 1);
 
 $window->add($grid);
+
+if ($active_qa_repo) {
+    set_state('enabled');
+} else {
+    set_state('disabled');
+}
+
 $window->show_all;
 
 Gtk3->main;
 
-my $ignore_change;
+###############################################################################
+# GUI Callbacks
+###############################################################################
 
-sub changed() {
-    if ($ignore_change) {
-        $ignore_change = 0;
-    } else {
-        $button3->set_sensitive(TRUE);
-    }
+sub changed {
+    set_state('changed');
 }
 
-sub quit() {
+sub quit {
     get_settings();
     if (open(my $f, '>', $config_file)) {
         print $f "MIRROR=$mirror\n";
@@ -166,20 +224,13 @@ sub quit() {
     Gtk3->main_quit;
 }
 
-sub enable_disable() {
+sub disable {
     disable_buttons();
-    if ($active_qa_repo) {
-        disable_repo();
-    } else {
-        get_settings();
-        if (sync_repo()) {
-            enable_repo();
-        }
-    }
-    enable_buttons();
+    disable_repo();
+    set_state('disabled');
 }
 
-sub update() {
+sub enable {
     disable_buttons();
     get_settings();
     if (sync_repo()) {
@@ -193,38 +244,45 @@ sub update() {
             disable_repo();
         }
     }
-    enable_buttons();
+    if ($active_qa_repo) {
+        set_state('enabled');
+    } else {
+        set_state('failed');
+    }
 }
 
-my $clear_pending;
+sub clear {
+    $entry5->get_buffer()->set_text("");
+}
 
-sub clear() {
-    disable_buttons();
-    get_settings();
-    clear_repo();
-    if ($active_qa_repo) {
-        disable_repo();
+###############################################################################
+# Subsidiary Functions
+###############################################################################
+
+sub set_state {
+    my ($new_state) = @_;
+    $state = $new_state;
+    $status->set_label($status_text{$state});
+    $button1->set_sensitive(TRUE);
+    $button2->set_sensitive($active_qa_repo);
+    $button3->set_sensitive($state ne 'enabled');
+    $button4->set_sensitive(TRUE);
+    if ($state eq 'changed' || $state eq 'failed') {
+        $button3->set_label('Update');
+    } else {
+        $button3->set_label('Enable');
     }
-    my $buffer = $entry5->get_buffer();
-    $ignore_change = $buffer->get_char_count() > 0;
-    $buffer->set_text("");
-    enable_buttons();
 }
 
-sub disable_buttons() {
+sub disable_buttons {
     $button1->set_sensitive(FALSE);
     $button2->set_sensitive(FALSE);
     $button3->set_sensitive(FALSE);
     $button4->set_sensitive(FALSE);
+    gtk_update();
 }
 
-sub enable_buttons() {
-    $button1->set_sensitive(TRUE);
-    $button2->set_sensitive(TRUE);
-    $button4->set_sensitive(TRUE);
-}
-
-sub get_settings() {
+sub get_settings {
     $mirror  = $entry1->get_text();
     $version = $entry2->get_text();
     $arch    = $entry3->get_active_text();
@@ -234,7 +292,7 @@ sub get_settings() {
     }
 }
 
-sub get_required_rpms() {
+sub get_required_rpms {
     my $buffer = $entry5->get_buffer();
     my $start  = $buffer->get_start_iter();
     my $end    = $buffer->get_end_iter();
@@ -242,34 +300,33 @@ sub get_required_rpms() {
     grep { $_ ne '' } split("\n", $buffer->get_text($start, $end, FALSE));
 }
 
-sub get_existing_rpms() {
+sub get_existing_rpms {
     map { basename($_) } glob("$qa_repo/*.rpm");
 }
 
-sub disable_repo() {
+sub disable_repo {
     system("$sudo urpmi.removemedia '$qa_repo_name'") == 0
       or die "ERROR: couldn't disable the $qa_repo_name media.\n";
-    $button2->set_label('Enable');
     $active_qa_repo = '';
 }
 
-sub enable_repo() {
-    if (system("$sudo urpmi.addmedia --update '$qa_repo_name' $qa_repo") == 0) {
-        $button2->set_label('Disable');
+sub enable_repo {
+    if (system("$sudo urpmi.addmedia '$qa_repo_name' $qa_repo") == 0) {
         $active_qa_repo = $qa_repo;
     } else {
+        print "ERROR: couldn't enable the $qa_repo_name media.\n";
         $active_qa_repo = '';
     }
 }
 
-sub update_repo() {
+sub update_repo {
     if (system("$sudo urpmi.update '$qa_repo_name'") != 0) {
         print "ERROR: couldn't update the $qa_repo_name media.\n";
         disable_repo();
     }
 }
 
-sub clear_repo() {
+sub clear_repo {
     my @existing_rpms = get_existing_rpms();
     if (@existing_rpms) {
         unlink(map { "$qa_repo/$_" } @existing_rpms)
@@ -277,13 +334,19 @@ sub clear_repo() {
     }
 }
 
+my @available_rpms;
+
 my $sync_ok;
 
-sub sync_repo() {
+sub sync_repo {
+    $status->set_label('Updating');
+    $sync_ok = 1;
+
     my $sync_file;
     if      ($mirror =~ /^rsync:/) {
         $sync_file = \&sync_file_rsync;
-    } elsif ($mirror =~ /^ftp:/ || $mirror =~ /^http:/) {
+    } elsif ($mirror =~ /^ftp:/
+          || $mirror =~ /^http:/) {
         $sync_file = \&sync_file_aria2;
     } elsif ($mirror !~ /^\w+:/) {
         $sync_file = \&sync_file_link;
@@ -293,10 +356,44 @@ sub sync_repo() {
     }
 
     if ($version ne $last_version || $arch ne $last_arch) {
+        @available_rpms = ();
+        $last_version = $version;
+        $last_arch    = $arch;
         clear_repo();
+        gtk_update();
+    }
+
+    my $remote_repo = "$mirror/distrib/$version/$arch/media";
+
+    if (@available_rpms == 0) {
+        my $download_dir = "$qa_repo/.download";
+        mkdir_p($download_dir);
+        foreach my $media_type (qw(core nonfree tainted)) {
+            my $synthesis = 'synthesis.hdlist.cz';
+            my $remote_dir = "$remote_repo/$media_type/updates_testing/media_info";
+            &$sync_file("$remote_dir/$synthesis", $download_dir) or next;
+            my @package_list = split("\n", `urpmq --synthesis $download_dir/$synthesis --list -f`);
+            foreach my $package (@package_list) {
+                push(@available_rpms, "$package.rpm");
+            }
+            unlink("$download_dir/$synthesis")
+              or die "ERROR: couldn't delete/unlink $download_dir/$synthesis in the QA repo.\n";
+            gtk_update();
+        }
     }
 
-    my @required_rpms = get_required_rpms();
+    my @required_rpms = ();
+    foreach my $request (get_required_rpms()) {
+        my $pattern = wildcard_to_regexp($request);
+        my $matched = 0;
+        foreach my $candidate (@available_rpms) {
+            if ($candidate =~ /^$pattern/) {
+                push(@required_rpms, $candidate);
+                $matched = 1;
+            }
+        }
+        $matched or sync_error("no match for $request in the remote repository");
+    }
     my @existing_rpms = get_existing_rpms();
     my @unwanted_rpms = difference2(\@existing_rpms, \@required_rpms);
     if (@unwanted_rpms) {
@@ -309,26 +406,29 @@ sub sync_repo() {
           or die "ERROR: couldn't delete/unlink old pubkey in the QA repo.\n";
     }
 
-    mkdir_p("$qa_repo/media_info/");
+    mkdir_p("$qa_repo/media_info");
+    gtk_update();
 
-    $sync_ok = 1;
-    my $remote_repo = $mirror . '/distrib/' . $version . '/' . $arch . '/media';
     foreach my $rpm (difference2(\@required_rpms, \@existing_rpms)) {
         my $remote_url = $remote_repo;
         if ($rpm =~ /tainted/) {
-            $remote_url .= '/tainted/updates_testing/' . $rpm;
+            $remote_url .= "/tainted/updates_testing/$rpm";
         } elsif ($rpm =~ /nonfree/) {
-            $remote_url .= '/nonfree/updates_testing/' . $rpm;
+            $remote_url .= "/nonfree/updates_testing/$rpm";
         } else {
-            $remote_url .= '/core/updates_testing/' . $rpm;
+            $remote_url .= "/core/updates_testing/$rpm";
         }
         &$sync_file($remote_url, $qa_repo);
+        gtk_update();
     }
-    &$sync_file($remote_repo . '/core/updates_testing/media_info/pubkey', $qa_repo . '/media_info');
+    &$sync_file("$remote_repo/core/updates_testing/media_info/pubkey", "$qa_repo/media_info");
+    gtk_update();
 
     if ($sync_ok) {
-        system("genhdlist2 $qa_repo") == 0
+        system("genhdlist2 --allow-empty-media $qa_repo") == 0
           or sync_error("failed to update hdlist");
+    } else {
+        print "ERROR: failed to download all the files.\n"
     }
 
     $sync_ok;
@@ -345,7 +445,13 @@ sub sync_file_aria2 {
     my ($src_url, $dst_dir) = @_;
     print "fetching $src_url\n";
     system("aria2c -q -d $dst_dir $src_url") == 0
-      or sync_error("failed to download $src_url");
+      and return 1;
+
+    # aria2c leaves empty or partially downloaded files.
+    my $dst_file = $dst_dir . '/' . basename($src_url);
+    unlink($dst_file) if -e $dst_file;
+
+    sync_error("failed to download $src_url");
 }
 
 sub sync_file_link {
@@ -358,4 +464,19 @@ sub sync_error {
     my ($message) = @_;
     print "ERROR: $message.\n";
     $sync_ok = 0;
+    0;
+}
+
+sub wildcard_to_regexp {
+    my ($pattern) = @_;
+    $pattern =~ s/\./\\./g;
+    $pattern =~ s/\*/.*/g;
+    $pattern =~ s/\?/./g;
+    $pattern;
+}
+
+sub gtk_update {
+    while (Gtk3::events_pending()) {
+        Gtk3::main_iteration();
+    }
 }
-- 
cgit v1.2.1


From 654a14c7d32f5cde599329936e9675caa8834016 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Fri, 30 Mar 2018 00:09:07 +0100
Subject: New release

A few more changes:

  - enables 'QA Testing' as an updates repository
    (fixes regression in v1.1)
  - ignores leading/trailing white space in entries
  - discards duplicates in RPMs list
    (so T.J.'s wildcard list is handled properly now)
  - reports errors in a pop-up dialogue window
---
 qarepo.pl | 181 +++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 132 insertions(+), 49 deletions(-)

diff --git a/qarepo.pl b/qarepo.pl
index 957ce12..fe623dd 100644
--- a/qarepo.pl
+++ b/qarepo.pl
@@ -25,7 +25,7 @@ use Glib qw(TRUE FALSE);
 use Gtk3 '-init';
 use MDK::Common;
 
-my $release = 'v1.1';
+my $release = 'v1.2';
 
 ###############################################################################
 # States and Status
@@ -44,7 +44,7 @@ my $state;
 # Initial Configuration
 ###############################################################################
 
-my $home = $ENV{HOME} or die "ERROR: the HOME environment variable is not set.\n";
+my $home = $ENV{HOME} || './';
 
 # Only use sudo if not run by root.
 my $sudo = $> ? 'sudo' : '';
@@ -81,7 +81,7 @@ my $last_version = $version;
 my $last_arch    = $arch;
 
 ###############################################################################
-# GUI
+# GUI Main Window
 ###############################################################################
 
 my $window = Gtk3::Window->new('toplevel');
@@ -200,9 +200,55 @@ if ($active_qa_repo) {
     set_state('disabled');
 }
 
-$window->show_all;
+###############################################################################
+# GUI Error Dialogue
+###############################################################################
+
+my $error_window = Gtk3::Window->new('toplevel');
+
+my $error_grid   = Gtk3::Grid->new();
+
+my $error_label  = Gtk3::Label->new('The following error(s) occurred:');
+
+my $error_text   = Gtk3::TextView->new();
+
+my $error_scroll = Gtk3::ScrolledWindow->new();
+
+my $error_button = Gtk3::Button->new('Dismiss');
+
+$error_window->set_title("Error");
+$error_window->set_default_size(600, 300);
+$error_window->set_border_width(10);
+$error_window->set_type_hint('dialog');
+$error_window->signal_connect(delete_event => sub { $error_window->hide_on_delete() });
+
+$error_grid->set_row_spacing(10);
+$error_grid->set_column_spacing(10);
+
+$error_label->set_halign('GTK_ALIGN_START');
+
+$error_text->set_editable(FALSE);
+
+$error_scroll->set_hexpand(TRUE);
+$error_scroll->set_vexpand(TRUE);
+$error_scroll->add($error_text);
+
+$error_button->signal_connect(clicked => sub { $error_window->hide() });
+$error_button->set_halign('GTK_ALIGN_CENTER');
+
+$error_grid->attach($error_label,  0, 0, 1, 1);
+$error_grid->attach($error_scroll, 0, 1, 1, 1);
+$error_grid->attach($error_button, 0, 2, 1, 1);
+
+$error_window->add($error_grid);
+
+###############################################################################
+# GUI Start
+###############################################################################
+
+$window->show_all();
 
-Gtk3->main;
+Gtk3->main();
 
 ###############################################################################
 # GUI Callbacks
@@ -252,7 +298,7 @@ sub enable {
 }
 
 sub clear {
-    $entry5->get_buffer()->set_text("");
+    $entry5->get_buffer()->set_text('');
 }
 
 ###############################################################################
@@ -283,10 +329,10 @@ sub disable_buttons {
 }
 
 sub get_settings {
-    $mirror  = $entry1->get_text();
-    $version = $entry2->get_text();
-    $arch    = $entry3->get_active_text();
-    $qa_repo = $entry4->get_text();
+    $mirror  = trim($entry1->get_text());
+    $version = trim($entry2->get_text());
+    $arch    = trim($entry3->get_active_text());
+    $qa_repo = trim($entry4->get_text());
     if ($active_qa_repo && $active_qa_repo ne $qa_repo) {
         disable_repo();
     }
@@ -297,7 +343,10 @@ sub get_required_rpms {
     my $start  = $buffer->get_start_iter();
     my $end    = $buffer->get_end_iter();
 
-    grep { $_ ne '' } split("\n", $buffer->get_text($start, $end, FALSE));
+    my @lines = split("\n", $buffer->get_text($start, $end, FALSE));
+    s/^\s+// foreach @lines;  # skip leading white space
+    s/\s+$// foreach @lines;  # skip leading white space
+    grep { $_ ne '' } @lines; # and discard blank lines
 }
 
 sub get_existing_rpms {
@@ -305,23 +354,31 @@ sub get_existing_rpms {
 }
 
 sub disable_repo {
-    system("$sudo urpmi.removemedia '$qa_repo_name'") == 0
-      or die "ERROR: couldn't disable the $qa_repo_name media.\n";
-    $active_qa_repo = '';
+    if (system("$sudo urpmi.removemedia '$qa_repo_name'") == 0) {
+        $active_qa_repo = '';
+    } else {
+        my $message = "couldn't disable the $qa_repo_name media";
+        show_error_dialogue($message);
+        die "ERROR: $message.\n";
+    }
 }
 
 sub enable_repo {
-    if (system("$sudo urpmi.addmedia '$qa_repo_name' $qa_repo") == 0) {
+    if (system("$sudo urpmi.addmedia --update '$qa_repo_name' $qa_repo") == 0) {
         $active_qa_repo = $qa_repo;
     } else {
-        print "ERROR: couldn't enable the $qa_repo_name media.\n";
+        my $message = "couldn't enable the $qa_repo_name media";
+        show_error_dialogue($message);
+        print "ERROR: $message.\n";
         $active_qa_repo = '';
     }
 }
 
 sub update_repo {
     if (system("$sudo urpmi.update '$qa_repo_name'") != 0) {
-        print "ERROR: couldn't update the $qa_repo_name media.\n";
+        my $message = "couldn't update the $qa_repo_name media";
+        show_error_dialogue($message);
+        print "ERROR: $message.\n";
         disable_repo();
     }
 }
@@ -329,18 +386,19 @@ sub update_repo {
 sub clear_repo {
     my @existing_rpms = get_existing_rpms();
     if (@existing_rpms) {
-        unlink(map { "$qa_repo/$_" } @existing_rpms)
-          or die "ERROR: couldn't delete/unlink existing RPMs in the QA repo.\n";
+        if (!unlink(map { "$qa_repo/$_" } @existing_rpms)) {
+            my $message = "couldn't delete existing RPMs in the QA repo";
+            show_error_dialogue($message);
+            die "ERROR: $message.\n";
+        }
     }
 }
 
-my @available_rpms;
-
-my $sync_ok;
+my @sync_errors;
 
 sub sync_repo {
     $status->set_label('Updating');
-    $sync_ok = 1;
+    @sync_errors = ();
 
     my $sync_file;
     if      ($mirror =~ /^rsync:/) {
@@ -351,12 +409,13 @@ sub sync_repo {
     } elsif ($mirror !~ /^\w+:/) {
         $sync_file = \&sync_file_link;
     } else {
-        sync_error("unsupported mirror URL type");
+        my $message = "unsupported mirror URL type";
+        show_error_dialogue($message);
+        print "ERROR: $message.\n";
         return 0;
     }
 
     if ($version ne $last_version || $arch ne $last_arch) {
-        @available_rpms = ();
         $last_version = $version;
         $last_arch    = $arch;
         clear_repo();
@@ -365,21 +424,24 @@ sub sync_repo {
 
     my $remote_repo = "$mirror/distrib/$version/$arch/media";
 
-    if (@available_rpms == 0) {
-        my $download_dir = "$qa_repo/.download";
-        mkdir_p($download_dir);
-        foreach my $media_type (qw(core nonfree tainted)) {
-            my $synthesis = 'synthesis.hdlist.cz';
-            my $remote_dir = "$remote_repo/$media_type/updates_testing/media_info";
-            &$sync_file("$remote_dir/$synthesis", $download_dir) or next;
-            my @package_list = split("\n", `urpmq --synthesis $download_dir/$synthesis --list -f`);
-            foreach my $package (@package_list) {
-                push(@available_rpms, "$package.rpm");
-            }
-            unlink("$download_dir/$synthesis")
-              or die "ERROR: couldn't delete/unlink $download_dir/$synthesis in the QA repo.\n";
-            gtk_update();
+    my $download_dir = "$qa_repo/.download";
+    mkdir_p($download_dir);
+
+    my @available_rpms = ();
+    foreach my $media_type (qw(core nonfree tainted)) {
+        my $synthesis = 'synthesis.hdlist.cz';
+        my $remote_dir = "$remote_repo/$media_type/updates_testing/media_info";
+        &$sync_file("$remote_dir/$synthesis", $download_dir) or next;
+        my @package_list = split("\n", `urpmq --synthesis $download_dir/$synthesis --list -f`);
+        foreach my $package (@package_list) {
+            push(@available_rpms, "$package.rpm");
+        }
+        if (!unlink("$download_dir/$synthesis")) {
+            my $message = "couldn't delete $download_dir/$synthesis in the QA repo.\n";
+            show_error_dialogue($message);
+            die "ERROR: $message.\n";
         }
+        gtk_update();
     }
 
     my @required_rpms = ();
@@ -388,22 +450,30 @@ sub sync_repo {
         my $matched = 0;
         foreach my $candidate (@available_rpms) {
             if ($candidate =~ /^$pattern/) {
-                push(@required_rpms, $candidate);
+                push(@required_rpms, $candidate) if !member($candidate, @required_rpms);
                 $matched = 1;
             }
         }
-        $matched or sync_error("no match for $request in the remote repository");
+        $matched or sync_error("$request not found in the remote repository");
     }
+
     my @existing_rpms = get_existing_rpms();
+
     my @unwanted_rpms = difference2(\@existing_rpms, \@required_rpms);
     if (@unwanted_rpms) {
-        unlink(map { "$qa_repo/$_" } @unwanted_rpms)
-          or die "ERROR: couldn't delete/unlink unwanted RPMs in the QA repo.\n";
+        if (!unlink(map { "$qa_repo/$_" } @unwanted_rpms)) {
+            my $message = "couldn't delete unwanted RPMs in the QA repo.\n";
+            show_error_dialogue($message);
+            die "ERROR: $message.\n";
+        }
     }
     my $old_pubkey = "$qa_repo/media_info/pubkey";
     if (-e $old_pubkey) {
-        unlink($old_pubkey)
-          or die "ERROR: couldn't delete/unlink old pubkey in the QA repo.\n";
+        if (!unlink($old_pubkey)) {
+            my $message = "couldn't delete old pubkey in the QA repo.\n";
+            show_error_dialogue($message);
+            die "ERROR: $message.\n";
+        }
     }
 
     mkdir_p("$qa_repo/media_info");
@@ -424,14 +494,15 @@ sub sync_repo {
     &$sync_file("$remote_repo/core/updates_testing/media_info/pubkey", "$qa_repo/media_info");
     gtk_update();
 
-    if ($sync_ok) {
+    if (@sync_errors == 0) {
         system("genhdlist2 --allow-empty-media $qa_repo") == 0
           or sync_error("failed to update hdlist");
     } else {
-        print "ERROR: failed to download all the files.\n"
+        print "ERROR: failed to download all the files.\n";
+        show_error_dialogue(@sync_errors);
     }
 
-    $sync_ok;
+    @sync_errors == 0;
 }
 
 sub sync_file_rsync {
@@ -462,11 +533,18 @@ sub sync_file_link {
 
 sub sync_error {
     my ($message) = @_;
+    push(@sync_errors, $message);
     print "ERROR: $message.\n";
-    $sync_ok = 0;
     0;
 }
 
+sub trim {
+    my ($text) = @_;
+    $text =~ s/^\s+//;
+    $text =~ s/\s+$//;
+    $text;
+}
+
 sub wildcard_to_regexp {
     my ($pattern) = @_;
     $pattern =~ s/\./\\./g;
@@ -475,6 +553,11 @@ sub wildcard_to_regexp {
     $pattern;
 }
 
+sub show_error_dialogue {
+    $error_text->get_buffer()->set_text(join("\n", @_));
+    $error_window->show_all();
+}
+
 sub gtk_update {
     while (Gtk3::events_pending()) {
         Gtk3::main_iteration();
-- 
cgit v1.2.1


From d7e77fdefb37e2b1244c7c38b544d6c893a671ed Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Fri, 30 Mar 2018 19:09:35 +0100
Subject: New release

I've added a couple of extra options:

1. "fuzzy version" will automatically replace the package
version/release in each requested package with a wildcard.
If there are multiple versions in the remote repository,
you'll get them all (and MageiaUpdate will then select the newest).
Note this only happens if the requested package name includes
the Mageia release (e.g. mga6) and if the package version
starts with a digit, to avoid false matches.

2. "add deps" will automatically add all dependencies of the
requested packages that can be satisfied from the updates_testing
repositories.

If you want to see what's actually been selected,
either quit the app. and restart it, or use

  urpmq --list --media 'QA Testing'

I would only use these options whilst things are in a state of flux.
You really want to test against a definitive package list before you
finally validate an update.

I've also added a couple of check boxes to let you enable/disable use
of the nonfree and tainted repositories.
---
 qarepo.pl | 196 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 137 insertions(+), 59 deletions(-)

diff --git a/qarepo.pl b/qarepo.pl
index fe623dd..c7d5947 100644
--- a/qarepo.pl
+++ b/qarepo.pl
@@ -20,12 +20,12 @@
 use strict;
 use warnings;
 
-use File::Temp qw(tmpnam);
 use Glib qw(TRUE FALSE);
 use Gtk3 '-init';
 use MDK::Common;
+use URPM;
 
-my $release = 'v1.2';
+my $release = 'v1.3';
 
 ###############################################################################
 # States and Status
@@ -51,6 +51,7 @@ my $sudo = $> ? 'sudo' : '';
 
 my %config;
 
+# Settings are stored in the config file in key=value format.
 my $config_file = "$home/.qareporc";
 if (open(my $f, '<', $config_file)) {
     while (my $line = <$f>) {
@@ -61,10 +62,13 @@ if (open(my $f, '<', $config_file)) {
     close($f);
 }
 
-my $mirror  = $config{MIRROR}  || 'rsync://mirrors.kernel.org/mirrors/mageia';
-my $version = $config{VERSION} || '6';
-my $arch    = $config{ARCH}    || 'x86_64';
-my $qa_repo = $config{QA_REPO} || "$home/qa-testing";
+# Use sensible defaults for settings not in the config file.
+my $mirror  = $config{MIRROR}  // 'rsync://mirrors.kernel.org/mirrors/mageia';
+my $version = $config{VERSION} // '6';
+my $arch    = $config{ARCH}    // 'x86_64';
+my $nonfree = $config{NONFREE} // 1;
+my $tainted = $config{TAINTED} // 1;
+my $qa_repo = $config{QA_REPO} // "$home/qa-testing";
 
 my $qa_repo_name = 'QA Testing';
 
@@ -84,35 +88,41 @@ my $last_arch    = $arch;
 # GUI Main Window
 ###############################################################################
 
-my $window = Gtk3::Window->new('toplevel');
+my $window  = Gtk3::Window->new('toplevel');
 
-my $grid = Gtk3::Grid->new();
+my $grid    = Gtk3::Grid->new();
 
-my $label1 = Gtk3::Label->new('Mirror:');
-my $entry1 = Gtk3::Entry->new();
+my $label1  = Gtk3::Label->new('Mirror:');
+my $entry1  = Gtk3::Entry->new();
 
-my $label2 = Gtk3::Label->new('Version:');
-my $entry2 = Gtk3::Entry->new();
+my $label2  = Gtk3::Label->new('Version:');
+my $entry2  = Gtk3::Entry->new();
 
-my $label3 = Gtk3::Label->new('Arch:');
-my $entry3 = Gtk3::ComboBoxText->new();
+my $label3  = Gtk3::Label->new('Arch:');
+my $entry3  = Gtk3::ComboBoxText->new();
 
-my $label4 = Gtk3::Label->new('QA Repo:');
-my $entry4 = Gtk3::Entry->new();
+my $label4  = Gtk3::Label->new('QA Repo:');
+my $entry4  = Gtk3::Entry->new();
 
-my $label5 = Gtk3::Label->new('RPMs:');
-my $entry5 = Gtk3::TextView->new();
+my $label5  = Gtk3::Label->new('RPMs:');
+my $entry5  = Gtk3::TextView->new();
 
-my $scroll = Gtk3::ScrolledWindow->new();
+my $scroll  = Gtk3::ScrolledWindow->new();
 
-my $label6 = Gtk3::Label->new('Status:');
-my $status = Gtk3::Label->new('');
+my $label6  = Gtk3::Label->new('Status:');
+my $status  = Gtk3::Label->new('');
 
 my $button1 = Gtk3::Button->new('Quit');
 my $button2 = Gtk3::Button->new('Disable');
 my $button3 = Gtk3::Button->new('Enable');
 my $button4 = Gtk3::Button->new('Clear');
 
+my $check1  = Gtk3::CheckButton->new_with_label("nonfree");
+my $check2  = Gtk3::CheckButton->new_with_label("tainted");
+
+my $check3  = Gtk3::CheckButton->new_with_label("fuzzy\nversion");
+my $check4  = Gtk3::CheckButton->new_with_label("add\ndeps");
+
 $window->set_title("QA Repo  $release");
 $window->set_default_size(600, 400);
 $window->set_border_width(10);
@@ -130,7 +140,8 @@ $entry1->signal_connect(changed => \&changed);
 $label2->set_halign('GTK_ALIGN_END');
 
 $entry2->set_text($version);
-$entry2->set_hexpand(FALSE);
+$entry2->set_width_chars(2);
+$entry2->set_hexpand(TRUE);
 $entry2->signal_connect(changed => \&changed);
 
 $label3->set_halign('GTK_ALIGN_END');
@@ -169,28 +180,46 @@ $button1->signal_connect(clicked => \&quit);
 $button2->signal_connect(clicked => \&disable);
 
 $button3->signal_connect(clicked => \&enable);
-$button3->set_valign('GTK_ALIGN_START');
 
-$button4->signal_connect(clicked => \&clear);
+$button4->set_vexpand(TRUE);
 $button4->set_valign('GTK_ALIGN_END');
+$button4->signal_connect(clicked => \&clear);
+
+$check1->signal_connect(clicked => \&changed);
+$check1->set_active($nonfree);
+
+$check2->signal_connect(clicked => \&changed);
+$check2->set_active($tainted);
+
+$check3->signal_connect(clicked => \&changed);
+$check3->set_active(FALSE);
+
+$check4->signal_connect(clicked => \&changed);
+$check4->set_active(FALSE);
 
 $grid->attach($label1, 0, 0, 1, 1);
-$grid->attach($entry1, 1, 0, 4, 1);
+$grid->attach($entry1, 1, 0, 6, 1);
+
 $grid->attach($label2, 1, 1, 1, 1);
 $grid->attach($entry2, 2, 1, 1, 1);
 $grid->attach($label3, 3, 1, 1, 1);
 $grid->attach($entry3, 4, 1, 1, 1);
+$grid->attach($check1, 5, 1, 1, 1);
+$grid->attach($check2, 6, 1, 1, 1);
+
 $grid->attach($label4, 0, 2, 1, 1);
-$grid->attach($entry4, 1, 2, 4, 1);
+$grid->attach($entry4, 1, 2, 6, 1);
 $grid->attach($label5, 0, 3, 1, 1);
-$grid->attach($scroll, 1, 3, 4, 2);
-$grid->attach($label6, 0, 5, 1, 1);
-$grid->attach($status, 1, 5, 4, 1);
+$grid->attach($scroll, 1, 3, 6, 4);
+$grid->attach($label6, 0, 7, 1, 1);
+$grid->attach($status, 1, 7, 6, 1);
 
-$grid->attach($button1, 5, 0, 1, 1);
-$grid->attach($button2, 5, 2, 1, 1);
-$grid->attach($button3, 5, 3, 1, 1);
-$grid->attach($button4, 5, 4, 1, 1);
+$grid->attach($button1, 7, 0, 1, 1);
+$grid->attach($button2, 7, 2, 1, 1);
+$grid->attach($button3, 7, 3, 1, 1);
+$grid->attach($check3,  7, 4, 1, 1);
+$grid->attach($check4,  7, 5, 1, 1);
+$grid->attach($button4, 7, 6, 1, 1);
 
 $window->add($grid);
 
@@ -261,10 +290,12 @@ sub changed {
 sub quit {
     get_settings();
     if (open(my $f, '>', $config_file)) {
-        print $f "MIRROR=$mirror\n";
-        print $f "VERSION=$version\n";
-        print $f "ARCH=$arch\n";
-        print $f "QA_REPO=$qa_repo\n";
+        printf $f "MIRROR=%s\n",  $mirror;
+        printf $f "VERSION=%s\n", $version;
+        printf $f "ARCH=%s\n",    $arch;
+        printf $f "NONFREE=%d\n", $nonfree;
+        printf $f "TAINTED=%d\n", $tainted;
+        printf $f "QA_REPO=%s\n", $qa_repo;
         close($f);
     }
     Gtk3->main_quit;
@@ -332,20 +363,28 @@ sub get_settings {
     $mirror  = trim($entry1->get_text());
     $version = trim($entry2->get_text());
     $arch    = trim($entry3->get_active_text());
+    $nonfree = $check1->get_active();
+    $tainted = $check2->get_active();
     $qa_repo = trim($entry4->get_text());
     if ($active_qa_repo && $active_qa_repo ne $qa_repo) {
         disable_repo();
     }
 }
 
-sub get_required_rpms {
+sub get_requested_rpms {
     my $buffer = $entry5->get_buffer();
     my $start  = $buffer->get_start_iter();
     my $end    = $buffer->get_end_iter();
 
+    my $fuzzy_version = $check3->get_active();
+
     my @lines = split("\n", $buffer->get_text($start, $end, FALSE));
-    s/^\s+// foreach @lines;  # skip leading white space
-    s/\s+$// foreach @lines;  # skip leading white space
+    if ($fuzzy_version) {
+        # replace version-release with wildcard
+        s/-\d.*-.+(\.mga$version(?:(?:\.$arch|\.noarch)(?:\.rpm)?)?)$/-\\d*$1/ foreach @lines;
+    }
+    s/^\s+// foreach @lines;  # trim leading white space
+    s/\s+$// foreach @lines;  # trim trailing white space
     grep { $_ ne '' } @lines; # and discard blank lines
 }
 
@@ -384,7 +423,8 @@ sub update_repo {
 }
 
 sub clear_repo {
-    my @existing_rpms = get_existing_rpms();
+    my ($type) = @_;
+    my @existing_rpms = grep { $_ =~ /$type/ } get_existing_rpms();
     if (@existing_rpms) {
         if (!unlink(map { "$qa_repo/$_" } @existing_rpms)) {
             my $message = "couldn't delete existing RPMs in the QA repo";
@@ -422,20 +462,41 @@ sub sync_repo {
         gtk_update();
     }
 
+    my $add_dependencies = $check4->get_active();
+
     my $remote_repo = "$mirror/distrib/$version/$arch/media";
 
+    my @mediatypes = ( 'core' );
+    push @mediatypes, 'nonfree' if $nonfree;
+    push @mediatypes, 'tainted' if $tainted;
+
     my $download_dir = "$qa_repo/.download";
     mkdir_p($download_dir);
 
-    my @available_rpms = ();
-    foreach my $media_type (qw(core nonfree tainted)) {
+    my %rpm_dependencies;
+    foreach my $media_type (@mediatypes) {
         my $synthesis = 'synthesis.hdlist.cz';
         my $remote_dir = "$remote_repo/$media_type/updates_testing/media_info";
         &$sync_file("$remote_dir/$synthesis", $download_dir) or next;
-        my @package_list = split("\n", `urpmq --synthesis $download_dir/$synthesis --list -f`);
-        foreach my $package (@package_list) {
-            push(@available_rpms, "$package.rpm");
-        }
+        gtk_update();
+
+        my $urpm = new URPM;
+        $urpm->parse_synthesis("$download_dir/$synthesis");
+        $urpm->traverse(sub {
+            my ($pkg) = @_;
+            my $name = $pkg->fullname();
+            my $rpm = "$name.rpm";
+            %{$rpm_dependencies{$rpm}} = ();
+            if ($add_dependencies) {
+                my @requires = ( $pkg->requires_nosense(), $pkg->recommends_nosense );
+                $urpm->traverse_tag('whatprovides', \@requires, sub {
+                    my ($pkg) = @_;
+                    my $name = $pkg->fullname();
+                    ${$rpm_dependencies{$rpm}}{"$name.rpm"} = 1;
+                });
+            }
+        });
+
         if (!unlink("$download_dir/$synthesis")) {
             my $message = "couldn't delete $download_dir/$synthesis in the QA repo.\n";
             show_error_dialogue($message);
@@ -444,21 +505,34 @@ sub sync_repo {
         gtk_update();
     }
 
-    my @required_rpms = ();
-    foreach my $request (get_required_rpms()) {
-        my $pattern = wildcard_to_regexp($request);
-        my $matched = 0;
-        foreach my $candidate (@available_rpms) {
-            if ($candidate =~ /^$pattern/) {
-                push(@required_rpms, $candidate) if !member($candidate, @required_rpms);
-                $matched = 1;
+    my %selection;
+    my @requests = get_requested_rpms();
+    while (@requests) {
+        foreach my $request (@requests) {
+            my $pattern = wildcard_to_regexp($request);
+            my $matched = 0;
+            foreach my $candidate (keys %rpm_dependencies) {
+                if ($candidate =~ /^$pattern/) {
+                    $selection{$candidate} = 1;
+                    $selection{$_} ||= 2 foreach keys %{$rpm_dependencies{$candidate}};
+                    $matched = 1;
+                }
             }
+            $matched or sync_error("$request not found in the remote repository");
         }
-        $matched or sync_error("$request not found in the remote repository");
+        # avoid infinite loop if we haven't found a match
+        last if @sync_errors;
+        # recurse through any new dependencies
+        @requests = grep { $selection{$_} == 2 } keys %selection;
     }
 
-    my @existing_rpms = get_existing_rpms();
+    if (@sync_errors) {
+        show_error_dialogue(@sync_errors);
+        return 0;
+    }
 
+    my @required_rpms = keys %selection;
+    my @existing_rpms = get_existing_rpms();
     my @unwanted_rpms = difference2(\@existing_rpms, \@required_rpms);
     if (@unwanted_rpms) {
         if (!unlink(map { "$qa_repo/$_" } @unwanted_rpms)) {
@@ -499,10 +573,14 @@ sub sync_repo {
           or sync_error("failed to update hdlist");
     } else {
         print "ERROR: failed to download all the files.\n";
+    }
+
+    if (@sync_errors) {
         show_error_dialogue(@sync_errors);
+        return 0;
     }
 
-    @sync_errors == 0;
+    1;
 }
 
 sub sync_file_rsync {
@@ -533,7 +611,7 @@ sub sync_file_link {
 
 sub sync_error {
     my ($message) = @_;
-    push(@sync_errors, $message);
+    push @sync_errors, $message;
     print "ERROR: $message.\n";
     0;
 }
-- 
cgit v1.2.1


From 30a195d307f9166ea5ca6b0b93ec3b205472ee87 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sat, 31 Mar 2018 14:00:02 +0100
Subject: New release

This version supports simultaneous 32-bit and 64-bit local repos.
They will be (unimaginatively) named 'QA Testing (32-bit)' and 'QA Testing (64-bit)'.
The repos will be stored in 'i586' and 'x86_64' subdirectories of the directory
specified in the QA Repo box.

Each repo can be independently enabled/disabled. The repos can have different contents.
When you switch between them in the GUI, the RPMs box will be updated to show the current
contents of the selected repo.

Before using the new version, make sure the old 'QA Testing' repo is disabled, and, if you
want to save redownloading lots of files, move the the contents of your current repo down one
level into the appropriately named (i586 or x86_64) subdirectory.
---
 qarepo.pl | 224 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 131 insertions(+), 93 deletions(-)

diff --git a/qarepo.pl b/qarepo.pl
index c7d5947..cc6045e 100644
--- a/qarepo.pl
+++ b/qarepo.pl
@@ -25,7 +25,7 @@ use Gtk3 '-init';
 use MDK::Common;
 use URPM;
 
-my $release = 'v1.3';
+my $version = 'v1.4';
 
 ###############################################################################
 # States and Status
@@ -64,25 +64,25 @@ if (open(my $f, '<', $config_file)) {
 
 # Use sensible defaults for settings not in the config file.
 my $mirror  = $config{MIRROR}  // 'rsync://mirrors.kernel.org/mirrors/mageia';
-my $version = $config{VERSION} // '6';
+my $release = $config{RELEASE} // '6';
 my $arch    = $config{ARCH}    // 'x86_64';
 my $nonfree = $config{NONFREE} // 1;
 my $tainted = $config{TAINTED} // 1;
 my $qa_repo = $config{QA_REPO} // "$home/qa-testing";
 
-my $qa_repo_name = 'QA Testing';
-
-my $repo_name_and_url = `urpmq --list-url | grep '$qa_repo_name '`;
-chomp($repo_name_and_url);
+my %qa_repo_names = (
+    i586   => 'QA Testing (32-bit)',
+    x86_64 => 'QA Testing (64-bit)'
+);
 
-my $active_qa_repo = $repo_name_and_url =~ s/$qa_repo_name +//r;
+my $qa_repo_name;
+my $active_qa_repo;
 
-if ($repo_name_and_url && $active_qa_repo ne $qa_repo) {
-    disable_repo();
-}
+my $last_release = $release;
+my $last_arch    = '';
 
-my $last_version = $version;
-my $last_arch    = $arch;
+my $fatal_message = '*** application will terminate ***';
+my $fatal_error;
 
 ###############################################################################
 # GUI Main Window
@@ -95,14 +95,14 @@ my $grid    = Gtk3::Grid->new();
 my $label1  = Gtk3::Label->new('Mirror:');
 my $entry1  = Gtk3::Entry->new();
 
-my $label2  = Gtk3::Label->new('Version:');
+my $label2  = Gtk3::Label->new('Release:');
 my $entry2  = Gtk3::Entry->new();
 
-my $label3  = Gtk3::Label->new('Arch:');
-my $entry3  = Gtk3::ComboBoxText->new();
+my $label3  = Gtk3::Label->new('QA Repo:');
+my $entry3  = Gtk3::Entry->new();
 
-my $label4  = Gtk3::Label->new('QA Repo:');
-my $entry4  = Gtk3::Entry->new();
+my $label4  = Gtk3::Label->new('Arch:');
+my $entry4  = Gtk3::ComboBoxText->new();
 
 my $label5  = Gtk3::Label->new('RPMs:');
 my $entry5  = Gtk3::TextView->new();
@@ -117,13 +117,14 @@ my $button2 = Gtk3::Button->new('Disable');
 my $button3 = Gtk3::Button->new('Enable');
 my $button4 = Gtk3::Button->new('Clear');
 
+my $check0  = Gtk3::CheckButton->new_with_label("core");
 my $check1  = Gtk3::CheckButton->new_with_label("nonfree");
 my $check2  = Gtk3::CheckButton->new_with_label("tainted");
 
 my $check3  = Gtk3::CheckButton->new_with_label("fuzzy\nversion");
 my $check4  = Gtk3::CheckButton->new_with_label("add\ndeps");
 
-$window->set_title("QA Repo  $release");
+$window->set_title("QA Repo  $version");
 $window->set_default_size(600, 400);
 $window->set_border_width(10);
 $window->signal_connect(delete_event => \&quit);
@@ -139,32 +140,31 @@ $entry1->signal_connect(changed => \&changed);
 
 $label2->set_halign('GTK_ALIGN_END');
 
-$entry2->set_text($version);
+$entry2->set_text($release);
 $entry2->set_width_chars(2);
 $entry2->set_hexpand(TRUE);
 $entry2->signal_connect(changed => \&changed);
 
 $label3->set_halign('GTK_ALIGN_END');
 
-$entry3->append_text('i586');
-$entry3->append_text('x86_64');
-if ($arch eq 'x86_64') {
-    $entry3->set_active(1);
-} else {
-    $entry3->set_active(0);
-}
+$entry3->set_text($qa_repo);
+$entry3->set_hexpand(TRUE);
 $entry3->signal_connect(changed => \&changed);
 
 $label4->set_halign('GTK_ALIGN_END');
 
-$entry4->set_text($qa_repo);
-$entry4->set_hexpand(TRUE);
+$entry4->append_text('i586');
+$entry4->append_text('x86_64');
+if ($arch eq 'x86_64') {
+    $entry4->set_active(1);
+} else {
+    $entry4->set_active(0);
+}
 $entry4->signal_connect(changed => \&changed);
 
 $label5->set_valign('GTK_ALIGN_START');
 $label5->set_halign('GTK_ALIGN_END');
 
-$entry5->get_buffer->set_text(join("\n", get_existing_rpms()));
 $entry5->get_buffer->signal_connect(changed => \&changed);
 
 $scroll->set_hexpand(TRUE);
@@ -185,34 +185,37 @@ $button4->set_vexpand(TRUE);
 $button4->set_valign('GTK_ALIGN_END');
 $button4->signal_connect(clicked => \&clear);
 
-$check1->signal_connect(clicked => \&changed);
+$check0->set_active(TRUE);
+$check0->set_sensitive(FALSE);
+
 $check1->set_active($nonfree);
+$check1->signal_connect(clicked => \&changed);
 
-$check2->signal_connect(clicked => \&changed);
 $check2->set_active($tainted);
+$check2->signal_connect(clicked => \&changed);
 
-$check3->signal_connect(clicked => \&changed);
 $check3->set_active(FALSE);
+$check3->signal_connect(clicked => \&changed);
 
-$check4->signal_connect(clicked => \&changed);
 $check4->set_active(FALSE);
+$check4->signal_connect(clicked => \&changed);
 
 $grid->attach($label1, 0, 0, 1, 1);
-$grid->attach($entry1, 1, 0, 6, 1);
+$grid->attach($entry1, 1, 0, 5, 1);
 
 $grid->attach($label2, 1, 1, 1, 1);
 $grid->attach($entry2, 2, 1, 1, 1);
-$grid->attach($label3, 3, 1, 1, 1);
-$grid->attach($entry3, 4, 1, 1, 1);
-$grid->attach($check1, 5, 1, 1, 1);
-$grid->attach($check2, 6, 1, 1, 1);
+$grid->attach($check0, 3, 1, 1, 1);
+$grid->attach($check1, 4, 1, 1, 1);
+$grid->attach($check2, 5, 1, 1, 1);
 
-$grid->attach($label4, 0, 2, 1, 1);
-$grid->attach($entry4, 1, 2, 6, 1);
+$grid->attach($label3, 0, 2, 1, 1);
+$grid->attach($entry3, 1, 2, 4, 1);
+$grid->attach($entry4, 5, 2, 1, 1);
 $grid->attach($label5, 0, 3, 1, 1);
-$grid->attach($scroll, 1, 3, 6, 4);
+$grid->attach($scroll, 1, 3, 5, 4);
 $grid->attach($label6, 0, 7, 1, 1);
-$grid->attach($status, 1, 7, 6, 1);
+$grid->attach($status, 1, 7, 5, 1);
 
 $grid->attach($button1, 7, 0, 1, 1);
 $grid->attach($button2, 7, 2, 1, 1);
@@ -223,12 +226,6 @@ $grid->attach($button4, 7, 6, 1, 1);
 
 $window->add($grid);
 
-if ($active_qa_repo) {
-    set_state('enabled');
-} else {
-    set_state('disabled');
-}
-
 ###############################################################################
 # GUI Error Dialogue
 ###############################################################################
@@ -249,7 +246,7 @@ $error_window->set_title("Error");
 $error_window->set_default_size(600, 300);
 $error_window->set_border_width(10);
 $error_window->set_type_hint('dialog');
-$error_window->signal_connect(delete_event => sub { $error_window->hide_on_delete() });
+$error_window->signal_connect(delete_event => \&error_dismiss);
 
 $error_grid->set_row_spacing(10);
 $error_grid->set_column_spacing(10);
@@ -262,7 +259,7 @@ $error_scroll->set_hexpand(TRUE);
 $error_scroll->set_vexpand(TRUE);
 $error_scroll->add($error_text);
 
-$error_button->signal_connect(clicked => sub { $error_window->hide() });
+$error_button->signal_connect(clicked => \&error_dismiss);
 $error_button->set_halign('GTK_ALIGN_CENTER');
 
 $error_grid->attach($error_label,  0, 0, 1, 1);
@@ -275,6 +272,8 @@ $error_window->add($error_grid);
 # GUI Start
 ###############################################################################
 
+changed();
+
 $window->show_all();
 
 Gtk3->main();
@@ -284,21 +283,32 @@ Gtk3->main();
 ###############################################################################
 
 sub changed {
-    set_state('changed');
+    $arch = trim($entry4->get_active_text());
+    if ($arch ne $last_arch) {
+        $last_arch = $arch;
+        set_qa_repo_info();
+        if ($active_qa_repo) {
+            set_state('enabled');
+        } else {
+            set_state('disabled');
+        }
+    } else {
+        set_state('changed');
+    }
 }
 
 sub quit {
     get_settings();
     if (open(my $f, '>', $config_file)) {
         printf $f "MIRROR=%s\n",  $mirror;
-        printf $f "VERSION=%s\n", $version;
+        printf $f "RELEASE=%s\n", $release;
         printf $f "ARCH=%s\n",    $arch;
         printf $f "NONFREE=%d\n", $nonfree;
         printf $f "TAINTED=%d\n", $tainted;
         printf $f "QA_REPO=%s\n", $qa_repo;
         close($f);
     }
-    Gtk3->main_quit;
+    Gtk3->main_quit();
 }
 
 sub disable {
@@ -332,10 +342,33 @@ sub clear {
     $entry5->get_buffer()->set_text('');
 }
 
+sub error_dismiss {
+    if ($fatal_error) {
+        Gtk3->main_quit();
+    } else {
+        $error_window->hide_on_delete()
+    }
+}
+
 ###############################################################################
 # Subsidiary Functions
 ###############################################################################
 
+sub set_qa_repo_info {
+    $qa_repo_name = $qa_repo_names{$arch};
+
+    my $repo_name_and_url = `urpmq --list-url | grep '$qa_repo_name '`;
+    chomp($repo_name_and_url);
+
+    $active_qa_repo = $repo_name_and_url =~ s/\Q$qa_repo_name\E\s+(\S+)\/$arch/$1/r;
+
+    if ($repo_name_and_url && $active_qa_repo ne $qa_repo) {
+        disable_repo();
+    }
+
+    $entry5->get_buffer->set_text(join("\n", get_existing_rpms()));
+}
+
 sub set_state {
     my ($new_state) = @_;
     $state = $new_state;
@@ -361,11 +394,11 @@ sub disable_buttons {
 
 sub get_settings {
     $mirror  = trim($entry1->get_text());
-    $version = trim($entry2->get_text());
-    $arch    = trim($entry3->get_active_text());
+    $release = trim($entry2->get_text());
+    $arch    = trim($entry4->get_active_text());
     $nonfree = $check1->get_active();
     $tainted = $check2->get_active();
-    $qa_repo = trim($entry4->get_text());
+    $qa_repo = trim($entry3->get_text());
     if ($active_qa_repo && $active_qa_repo ne $qa_repo) {
         disable_repo();
     }
@@ -381,7 +414,7 @@ sub get_requested_rpms {
     my @lines = split("\n", $buffer->get_text($start, $end, FALSE));
     if ($fuzzy_version) {
         # replace version-release with wildcard
-        s/-\d.*-.+(\.mga$version(?:(?:\.$arch|\.noarch)(?:\.rpm)?)?)$/-\\d*$1/ foreach @lines;
+        s/-\d.*-.+(\.mga$release(?:(?:\.$arch|\.noarch)(?:\.rpm)?)?)$/-\\d*$1/ foreach @lines;
     }
     s/^\s+// foreach @lines;  # trim leading white space
     s/\s+$// foreach @lines;  # trim trailing white space
@@ -389,7 +422,7 @@ sub get_requested_rpms {
 }
 
 sub get_existing_rpms {
-    map { basename($_) } glob("$qa_repo/*.rpm");
+    map { basename($_) } glob("$qa_repo/$arch/*.rpm");
 }
 
 sub disable_repo {
@@ -397,18 +430,18 @@ sub disable_repo {
         $active_qa_repo = '';
     } else {
         my $message = "couldn't disable the $qa_repo_name media";
-        show_error_dialogue($message);
-        die "ERROR: $message.\n";
+        show_error_dialogue($message, $fatal_message);
+        print_error($message, 'fatal');
     }
 }
 
 sub enable_repo {
-    if (system("$sudo urpmi.addmedia --update '$qa_repo_name' $qa_repo") == 0) {
+    if (system("$sudo urpmi.addmedia --update '$qa_repo_name' $qa_repo/$arch") == 0) {
         $active_qa_repo = $qa_repo;
     } else {
         my $message = "couldn't enable the $qa_repo_name media";
         show_error_dialogue($message);
-        print "ERROR: $message.\n";
+        print_error($message);
         $active_qa_repo = '';
     }
 }
@@ -417,7 +450,7 @@ sub update_repo {
     if (system("$sudo urpmi.update '$qa_repo_name'") != 0) {
         my $message = "couldn't update the $qa_repo_name media";
         show_error_dialogue($message);
-        print "ERROR: $message.\n";
+        print_error($message);
         disable_repo();
     }
 }
@@ -426,10 +459,10 @@ sub clear_repo {
     my ($type) = @_;
     my @existing_rpms = grep { $_ =~ /$type/ } get_existing_rpms();
     if (@existing_rpms) {
-        if (!unlink(map { "$qa_repo/$_" } @existing_rpms)) {
+        if (!unlink(map { "$qa_repo/$arch/$_" } @existing_rpms)) {
             my $message = "couldn't delete existing RPMs in the QA repo";
-            show_error_dialogue($message);
-            die "ERROR: $message.\n";
+            show_error_dialogue($message, $fatal_message);
+            print_error($message, 'fatal');
         }
     }
 }
@@ -443,28 +476,27 @@ sub sync_repo {
     my $sync_file;
     if      ($mirror =~ /^rsync:/) {
         $sync_file = \&sync_file_rsync;
-    } elsif ($mirror =~ /^ftp:/
-          || $mirror =~ /^http:/) {
+    } elsif ($mirror =~ /^ftp:/ || $mirror =~ /^http:/) {
         $sync_file = \&sync_file_aria2;
     } elsif ($mirror !~ /^\w+:/) {
         $sync_file = \&sync_file_link;
     } else {
         my $message = "unsupported mirror URL type";
         show_error_dialogue($message);
-        print "ERROR: $message.\n";
+        print_error($message);
         return 0;
     }
 
-    if ($version ne $last_version || $arch ne $last_arch) {
-        $last_version = $version;
-        $last_arch    = $arch;
+    if ($release ne $last_release) {
+        $last_release = $release;
         clear_repo();
         gtk_update();
     }
 
     my $add_dependencies = $check4->get_active();
 
-    my $remote_repo = "$mirror/distrib/$version/$arch/media";
+    my $remote_repo = "$mirror/distrib/$release/$arch/media";
+    my $local_repo  = "$qa_repo/$arch";
 
     my @mediatypes = ( 'core' );
     push @mediatypes, 'nonfree' if $nonfree;
@@ -498,9 +530,9 @@ sub sync_repo {
         });
 
         if (!unlink("$download_dir/$synthesis")) {
-            my $message = "couldn't delete $download_dir/$synthesis in the QA repo.\n";
-            show_error_dialogue($message);
-            die "ERROR: $message.\n";
+            my $message = "couldn't delete $download_dir/$synthesis in the QA repo";
+            show_error_dialogue($message, $fatal_message);
+            print_error($message, 'fatal');
         }
         gtk_update();
     }
@@ -531,26 +563,26 @@ sub sync_repo {
         return 0;
     }
 
-    my @required_rpms = keys %selection;
+    my @required_rpms = sort keys %selection;
     my @existing_rpms = get_existing_rpms();
     my @unwanted_rpms = difference2(\@existing_rpms, \@required_rpms);
     if (@unwanted_rpms) {
-        if (!unlink(map { "$qa_repo/$_" } @unwanted_rpms)) {
-            my $message = "couldn't delete unwanted RPMs in the QA repo.\n";
-            show_error_dialogue($message);
-            die "ERROR: $message.\n";
+        if (!unlink(map { "$local_repo/$_" } @unwanted_rpms)) {
+            my $message = "couldn't delete unwanted RPMs in the QA repo";
+            show_error_dialogue($message, $fatal_message);
+            print_error($message, 'fatal');
         }
     }
-    my $old_pubkey = "$qa_repo/media_info/pubkey";
+    my $old_pubkey = "$local_repo/media_info/pubkey";
     if (-e $old_pubkey) {
         if (!unlink($old_pubkey)) {
-            my $message = "couldn't delete old pubkey in the QA repo.\n";
-            show_error_dialogue($message);
-            die "ERROR: $message.\n";
+            my $message = "couldn't delete old pubkey in the QA repo";
+            show_error_dialogue($message, $fatal_message);
+            print_error($message, 'fatal');
         }
     }
 
-    mkdir_p("$qa_repo/media_info");
+    mkdir_p("$local_repo/media_info");
     gtk_update();
 
     foreach my $rpm (difference2(\@required_rpms, \@existing_rpms)) {
@@ -562,17 +594,17 @@ sub sync_repo {
         } else {
             $remote_url .= "/core/updates_testing/$rpm";
         }
-        &$sync_file($remote_url, $qa_repo);
+        &$sync_file($remote_url, $local_repo);
         gtk_update();
     }
-    &$sync_file("$remote_repo/core/updates_testing/media_info/pubkey", "$qa_repo/media_info");
+    &$sync_file("$remote_repo/core/updates_testing/media_info/pubkey", "$local_repo/media_info");
     gtk_update();
 
-    if (@sync_errors == 0) {
-        system("genhdlist2 --allow-empty-media $qa_repo") == 0
-          or sync_error("failed to update hdlist");
+    if (@sync_errors) {
+        print_error('failed to download all the files');
     } else {
-        print "ERROR: failed to download all the files.\n";
+        system("genhdlist2 --allow-empty-media $local_repo") == 0
+          or sync_error("failed to update hdlist");
     }
 
     if (@sync_errors) {
@@ -612,7 +644,7 @@ sub sync_file_link {
 sub sync_error {
     my ($message) = @_;
     push @sync_errors, $message;
-    print "ERROR: $message.\n";
+    print_error($message);
     0;
 }
 
@@ -636,6 +668,12 @@ sub show_error_dialogue {
     $error_window->show_all();
 }
 
+sub print_error {
+    my ($message, $o_fatal) = @_;
+    print "ERROR: $message.\n";
+    $fatal_error = $o_fatal;
+}
+
 sub gtk_update {
     while (Gtk3::events_pending()) {
         Gtk3::main_iteration();
-- 
cgit v1.2.1


From 3cfabf4880b79b1b53b43c04910b77218ff8b44b Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 13 Nov 2018 19:41:56 +0000
Subject: Ensure a '+' in a package name is taken literally.

---
 qarepo.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qarepo.pl b/qarepo.pl
index cc6045e..5ce5714 100644
--- a/qarepo.pl
+++ b/qarepo.pl
@@ -25,7 +25,7 @@ use Gtk3 '-init';
 use MDK::Common;
 use URPM;
 
-my $version = 'v1.4';
+my $version = 'v1.5';
 
 ###############################################################################
 # States and Status
@@ -658,6 +658,7 @@ sub trim {
 sub wildcard_to_regexp {
     my ($pattern) = @_;
     $pattern =~ s/\./\\./g;
+    $pattern =~ s/\+/\\+/g;
     $pattern =~ s/\*/.*/g;
     $pattern =~ s/\?/./g;
     $pattern;
-- 
cgit v1.2.1


From 5709e009a6ca69fa9cb8963aeb26cae7403afd3c Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 13 Nov 2018 19:46:25 +0000
Subject: Use polkit for authentication instead of sudo.

---
 qarepo.pl | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/qarepo.pl b/qarepo.pl
index 5ce5714..6444253 100644
--- a/qarepo.pl
+++ b/qarepo.pl
@@ -46,8 +46,8 @@ my $state;
 
 my $home = $ENV{HOME} || './';
 
-# Only use sudo if not run by root.
-my $sudo = $> ? 'sudo' : '';
+# Only use pkexec if not run by root.
+my $pkexec = $> ? 'pkexec' : '';
 
 my %config;
 
@@ -426,7 +426,8 @@ sub get_existing_rpms {
 }
 
 sub disable_repo {
-    if (system("$sudo urpmi.removemedia '$qa_repo_name'") == 0) {
+    my $arch_type = $arch eq 'x86_64' ? '64' : '32';
+    if (system("$pkexec /usr/libexec/qarepo-helper disable $arch_type") == 0) {
         $active_qa_repo = '';
     } else {
         my $message = "couldn't disable the $qa_repo_name media";
@@ -436,7 +437,8 @@ sub disable_repo {
 }
 
 sub enable_repo {
-    if (system("$sudo urpmi.addmedia --update '$qa_repo_name' $qa_repo/$arch") == 0) {
+    my $arch_type = $arch eq 'x86_64' ? '64' : '32';
+    if (system("$pkexec /usr/libexec/qarepo-helper enable $arch_type $qa_repo/$arch") == 0) {
         $active_qa_repo = $qa_repo;
     } else {
         my $message = "couldn't enable the $qa_repo_name media";
@@ -447,7 +449,8 @@ sub enable_repo {
 }
 
 sub update_repo {
-    if (system("$sudo urpmi.update '$qa_repo_name'") != 0) {
+    my $arch_type = $arch eq 'x86_64' ? '64' : '32';
+    if (system("$pkexec /usr/libexec/qarepo-helper update $arch_type") != 0) {
         my $message = "couldn't update the $qa_repo_name media";
         show_error_dialogue($message);
         print_error($message);
-- 
cgit v1.2.1


From fe135b820483b369b51c9dbf860793289a51811d Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 13 Nov 2018 20:41:10 +0000
Subject: Add the qarepo-helper script and its associated polkit rules/actions.

---
 org.mageia.qarepo-helper.policy | 22 ++++++++++++++++++++++
 org.mageia.qarepo-helper.rules  | 10 ++++++++++
 qarepo-helper                   |  6 ++++++
 3 files changed, 38 insertions(+)
 create mode 100644 org.mageia.qarepo-helper.policy
 create mode 100644 org.mageia.qarepo-helper.rules
 create mode 100755 qarepo-helper

diff --git a/org.mageia.qarepo-helper.policy b/org.mageia.qarepo-helper.policy
new file mode 100644
index 0000000..bc5b24d
--- /dev/null
+++ b/org.mageia.qarepo-helper.policy
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+ <vendor>Mageia</vendor>
+ <vendor_url>http://www.mageia.org/</vendor_url>
+
+ <action id="org.mageia.qarepo-helper.pkexec.run">
+    <description>Run QA Repo helper script</description>
+    <message>Authentication is required to enable or disable the QA Repo local repository</message>
+    <icon_name>drakconf</icon_name>
+    <defaults>
+     <allow_any>no</allow_any>
+     <allow_inactive>no</allow_inactive>
+     <allow_active>auth_admin_keep</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/qarepo-helper</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">false</annotate>
+ </action>
+</policyconfig>
diff --git a/org.mageia.qarepo-helper.rules b/org.mageia.qarepo-helper.rules
new file mode 100644
index 0000000..8408234
--- /dev/null
+++ b/org.mageia.qarepo-helper.rules
@@ -0,0 +1,10 @@
+polkit.addRule(function(action, subject) {
+    if (action.id == "org.mageia.qarepo-helper.pkexec.run" &&
+        subject.local && subject.active &&
+        subject.isInGroup("qarepo")) {
+        return polkit.Result.YES;
+    } else {
+        return polkit.Result.AUTH_ADMIN_KEEP;
+    }
+});
+
diff --git a/qarepo-helper b/qarepo-helper
new file mode 100755
index 0000000..00107fa
--- /dev/null
+++ b/qarepo-helper
@@ -0,0 +1,6 @@
+#!/bin/sh
+case $1 in
+  disable) /usr/sbin/urpmi.removemedia "QA Testing ($2-bit)";;
+  enable)  /usr/sbin/urpmi.addmedia --update "QA Testing ($2-bit)" $3;;
+  update)  /usr/sbin/urpmi.update "QA Testing ($2-bit)";;
+esac
-- 
cgit v1.2.1


From e28378588618f059545db785b442ab3c8b92c5ce Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 13 Nov 2018 19:47:28 +0000
Subject: Only accept limited abbreviations of full package names.

Automatically add the arch/noarch and .rpm extension, but don't allow
incomplete or missing version numbers. We have wildcards and fuzzy
versions for that.
---
 qarepo.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qarepo.pl b/qarepo.pl
index 6444253..abbae63 100644
--- a/qarepo.pl
+++ b/qarepo.pl
@@ -547,7 +547,7 @@ sub sync_repo {
             my $pattern = wildcard_to_regexp($request);
             my $matched = 0;
             foreach my $candidate (keys %rpm_dependencies) {
-                if ($candidate =~ /^$pattern/) {
+                if ($candidate =~ /^($pattern)((\.($arch|noarch))?\.rpm)?$/) {
                     $selection{$candidate} = 1;
                     $selection{$_} ||= 2 foreach keys %{$rpm_dependencies{$candidate}};
                     $matched = 1;
-- 
cgit v1.2.1


From 32e294bf995eb3880fc5dfe22849b258ac797231 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 13 Nov 2018 19:52:45 +0000
Subject: Add check that no updates_testing media are currently enabled...

...as that defeats the purpose of using QARepo.
---
 qarepo.pl | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/qarepo.pl b/qarepo.pl
index abbae63..5a9cefb 100644
--- a/qarepo.pl
+++ b/qarepo.pl
@@ -318,6 +318,8 @@ sub disable {
 }
 
 sub enable {
+    check_no_testing_media("This may enable unwanted packages to be installed.")
+      or return;
     disable_buttons();
     get_settings();
     if (sync_repo()) {
@@ -354,6 +356,17 @@ sub error_dismiss {
 # Subsidiary Functions
 ###############################################################################
 
+sub check_no_testing_media {
+    my ($message2) = @_;
+    if (system("urpmq --list-url | grep -q updates_testing") == 0) {
+        my $message1 = "Some updates_testing media are enabled.";
+        my $message3 = "Please disable these media and try again.";
+        show_error_dialogue(($message1, $message2, $message3));
+        return 0;
+    }
+    1;
+}
+
 sub set_qa_repo_info {
     $qa_repo_name = $qa_repo_names{$arch};
 
-- 
cgit v1.2.1


From 8b3c84cf0755942cbe88f1bd56c5eca1169a1071 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 13 Nov 2018 20:14:26 +0000
Subject: Convert error dialogue window to general purpose dialogue window...

...in preparation for next commit.
---
 qarepo.pl | 60 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/qarepo.pl b/qarepo.pl
index 5a9cefb..fd6df5e 100644
--- a/qarepo.pl
+++ b/qarepo.pl
@@ -227,46 +227,45 @@ $grid->attach($button4, 7, 6, 1, 1);
 $window->add($grid);
 
 ###############################################################################
-# GUI Error Dialogue
+# GUI Dialogue Window
 ###############################################################################
 
-my $error_window = Gtk3::Window->new('toplevel');
+my $dialogue_window = Gtk3::Window->new('toplevel');
 
-my $error_grid   = Gtk3::Grid->new();
+my $dialogue_grid   = Gtk3::Grid->new();
 
-my $error_label  = Gtk3::Label->new('The following error(s) occurred:');
+my $dialogue_label  = Gtk3::Label->new();
 
-my $error_text   = Gtk3::TextView->new();
+my $dialogue_text   = Gtk3::TextView->new();
 
-my $error_scroll = Gtk3::ScrolledWindow->new();
+my $dialogue_scroll = Gtk3::ScrolledWindow->new();
 
-my $error_button = Gtk3::Button->new('Dismiss');
+my $dialogue_button = Gtk3::Button->new('Dismiss');
 
-$error_window->set_title("Error");
-$error_window->set_default_size(600, 300);
-$error_window->set_border_width(10);
-$error_window->set_type_hint('dialog');
-$error_window->signal_connect(delete_event => \&error_dismiss);
+$dialogue_window->set_default_size(600, 300);
+$dialogue_window->set_border_width(10);
+$dialogue_window->set_type_hint('dialog');
+$dialogue_window->signal_connect(delete_event => \&dialogue_dismiss);
 
-$error_grid->set_row_spacing(10);
-$error_grid->set_column_spacing(10);
+$dialogue_grid->set_row_spacing(10);
+$dialogue_grid->set_column_spacing(10);
 
-$error_label->set_halign('GTK_ALIGN_START');
+$dialogue_label->set_halign('GTK_ALIGN_START');
 
-$error_text->set_editable(FALSE);
+$dialogue_text->set_editable(FALSE);
 
-$error_scroll->set_hexpand(TRUE);
-$error_scroll->set_vexpand(TRUE);
-$error_scroll->add($error_text);
+$dialogue_scroll->set_hexpand(TRUE);
+$dialogue_scroll->set_vexpand(TRUE);
+$dialogue_scroll->add($dialogue_text);
 
-$error_button->signal_connect(clicked => \&error_dismiss);
-$error_button->set_halign('GTK_ALIGN_CENTER');
+$dialogue_button->signal_connect(clicked => \&dialogue_dismiss);
+$dialogue_button->set_halign('GTK_ALIGN_CENTER');
 
-$error_grid->attach($error_label,  0, 0, 1, 1);
-$error_grid->attach($error_scroll, 0, 1, 1, 1);
-$error_grid->attach($error_button, 0, 2, 1, 1);
+$dialogue_grid->attach($dialogue_label,  0, 0, 1, 1);
+$dialogue_grid->attach($dialogue_scroll, 0, 1, 1, 1);
+$dialogue_grid->attach($dialogue_button, 0, 2, 1, 1);
 
-$error_window->add($error_grid);
+$dialogue_window->add($dialogue_grid);
 
 ###############################################################################
 # GUI Start
@@ -344,11 +343,11 @@ sub clear {
     $entry5->get_buffer()->set_text('');
 }
 
-sub error_dismiss {
+sub dialogue_dismiss {
     if ($fatal_error) {
         Gtk3->main_quit();
     } else {
-        $error_window->hide_on_delete()
+        $dialogue_window->hide_on_delete()
     }
 }
 
@@ -681,8 +680,11 @@ sub wildcard_to_regexp {
 }
 
 sub show_error_dialogue {
-    $error_text->get_buffer()->set_text(join("\n", @_));
-    $error_window->show_all();
+    $dialogue_window->set_title('Error');
+    $dialogue_label->set_text('The following error(s) occurred:');
+    $dialogue_text->get_buffer()->set_text(join("\n", @_));
+    $dialogue_text->set_wrap_mode('GTK_WRAP_NONE');
+    $dialogue_window->show_all();
 }
 
 sub print_error {
-- 
cgit v1.2.1


From b1c7d97c84343398f39a1aa495e0516137227e2b Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 13 Nov 2018 20:34:00 +0000
Subject: Add option to suggest a downgrade command.

---
 qarepo.pl | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 3 deletions(-)

diff --git a/qarepo.pl b/qarepo.pl
index fd6df5e..bc49731 100644
--- a/qarepo.pl
+++ b/qarepo.pl
@@ -116,6 +116,7 @@ my $button1 = Gtk3::Button->new('Quit');
 my $button2 = Gtk3::Button->new('Disable');
 my $button3 = Gtk3::Button->new('Enable');
 my $button4 = Gtk3::Button->new('Clear');
+my $button5 = Gtk3::Button->new('Downgrade');
 
 my $check0  = Gtk3::CheckButton->new_with_label("core");
 my $check1  = Gtk3::CheckButton->new_with_label("nonfree");
@@ -185,6 +186,8 @@ $button4->set_vexpand(TRUE);
 $button4->set_valign('GTK_ALIGN_END');
 $button4->signal_connect(clicked => \&clear);
 
+$button5->signal_connect(clicked => \&downgrade);
+
 $check0->set_active(TRUE);
 $check0->set_sensitive(FALSE);
 
@@ -213,9 +216,9 @@ $grid->attach($label3, 0, 2, 1, 1);
 $grid->attach($entry3, 1, 2, 4, 1);
 $grid->attach($entry4, 5, 2, 1, 1);
 $grid->attach($label5, 0, 3, 1, 1);
-$grid->attach($scroll, 1, 3, 5, 4);
-$grid->attach($label6, 0, 7, 1, 1);
-$grid->attach($status, 1, 7, 5, 1);
+$grid->attach($scroll, 1, 3, 5, 5);
+$grid->attach($label6, 0, 8, 1, 1);
+$grid->attach($status, 1, 8, 5, 1);
 
 $grid->attach($button1, 7, 0, 1, 1);
 $grid->attach($button2, 7, 2, 1, 1);
@@ -223,6 +226,7 @@ $grid->attach($button3, 7, 3, 1, 1);
 $grid->attach($check3,  7, 4, 1, 1);
 $grid->attach($check4,  7, 5, 1, 1);
 $grid->attach($button4, 7, 6, 1, 1);
+$grid->attach($button5, 7, 7, 1, 1);
 
 $window->add($grid);
 
@@ -343,6 +347,17 @@ sub clear {
     $entry5->get_buffer()->set_text('');
 }
 
+sub downgrade {
+    check_no_testing_media("This may stop some packages from being downgraded.")
+      or return;
+    disable_buttons();
+    if ($active_qa_repo) {
+        disable_repo();
+    }
+    downgrade_packages();
+    set_state('disabled');
+}
+
 sub dialogue_dismiss {
     if ($fatal_error) {
         Gtk3->main_quit();
@@ -389,6 +404,7 @@ sub set_state {
     $button2->set_sensitive($active_qa_repo);
     $button3->set_sensitive($state ne 'enabled');
     $button4->set_sensitive(TRUE);
+    $button5->set_sensitive($state ne 'changed');
     if ($state eq 'changed' || $state eq 'failed') {
         $button3->set_label('Update');
     } else {
@@ -401,6 +417,7 @@ sub disable_buttons {
     $button2->set_sensitive(FALSE);
     $button3->set_sensitive(FALSE);
     $button4->set_sensitive(FALSE);
+    $button5->set_sensitive(FALSE);
     gtk_update();
 }
 
@@ -663,6 +680,34 @@ sub sync_error {
     0;
 }
 
+sub downgrade_packages {
+    my $synthesis = "$qa_repo/$arch/media_info/synthesis.hdlist.cz";
+    if (! -e $synthesis) {
+        my $message = "no synthesis file found in local repository";
+        show_error_dialogue($message);
+        print_error($message);
+        return 0;
+    }
+
+    my @packages;
+    my $urpm = new URPM;
+    $urpm->parse_synthesis($synthesis);
+    $urpm->traverse(sub {
+        my ($pkg) = @_;
+        my $full_name = $pkg->fullname;
+        if (system("rpm --quiet -q $full_name") == 0) {
+            push @packages, $pkg->name();
+        }
+    });
+
+    if (@packages) {
+        @packages = sort @packages;
+        show_downgrade_dialogue("urpmi --update --downgrade @packages");
+    } else {
+        show_error_dialogue("none of the listed packages are installed");
+    }
+}
+
 sub trim {
     my ($text) = @_;
     $text =~ s/^\s+//;
@@ -679,6 +724,14 @@ sub wildcard_to_regexp {
     $pattern;
 }
 
+sub show_downgrade_dialogue {
+    $dialogue_window->set_title('Downgrade');
+    $dialogue_label->set_text('The following command may be used to downgrade the listed packages:');
+    $dialogue_text->get_buffer()->set_text(join("\n", @_));
+    $dialogue_text->set_wrap_mode('GTK_WRAP_WORD_CHAR');
+    $dialogue_window->show_all();
+}
+
 sub show_error_dialogue {
     $dialogue_window->set_title('Error');
     $dialogue_label->set_text('The following error(s) occurred:');
-- 
cgit v1.2.1


From 753da93bfd2d46880c91c9c1587197b9da2b8b36 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 13 Nov 2018 20:43:14 +0000
Subject: Rename main program to simply 'qarepo'.

---
 qarepo    | 753 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 qarepo.pl | 753 --------------------------------------------------------------
 2 files changed, 753 insertions(+), 753 deletions(-)
 create mode 100644 qarepo
 delete mode 100644 qarepo.pl

diff --git a/qarepo b/qarepo
new file mode 100644
index 0000000..bc49731
--- /dev/null
+++ b/qarepo
@@ -0,0 +1,753 @@
+#!/usr/bin/perl
+
+# Copyright (C) 2018 Mageia
+#                    Martin Whitaker <mageia@martin-whitaker.me.uk>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
+
+use strict;
+use warnings;
+
+use Glib qw(TRUE FALSE);
+use Gtk3 '-init';
+use MDK::Common;
+use URPM;
+
+my $version = 'v1.5';
+
+###############################################################################
+# States and Status
+###############################################################################
+
+my %status_text = (
+    disabled => 'Disabled',
+    enabled  => 'Enabled',
+    changed  => 'Needs update',
+    failed   => 'Update failed'
+);
+
+my $state;
+
+###############################################################################
+# Initial Configuration
+###############################################################################
+
+my $home = $ENV{HOME} || './';
+
+# Only use pkexec if not run by root.
+my $pkexec = $> ? 'pkexec' : '';
+
+my %config;
+
+# Settings are stored in the config file in key=value format.
+my $config_file = "$home/.qareporc";
+if (open(my $f, '<', $config_file)) {
+    while (my $line = <$f>) {
+        chomp($line);
+        my ($key, $value) = split(/=/, $line);
+        $config{$key} = $value if $key;
+    }
+    close($f);
+}
+
+# Use sensible defaults for settings not in the config file.
+my $mirror  = $config{MIRROR}  // 'rsync://mirrors.kernel.org/mirrors/mageia';
+my $release = $config{RELEASE} // '6';
+my $arch    = $config{ARCH}    // 'x86_64';
+my $nonfree = $config{NONFREE} // 1;
+my $tainted = $config{TAINTED} // 1;
+my $qa_repo = $config{QA_REPO} // "$home/qa-testing";
+
+my %qa_repo_names = (
+    i586   => 'QA Testing (32-bit)',
+    x86_64 => 'QA Testing (64-bit)'
+);
+
+my $qa_repo_name;
+my $active_qa_repo;
+
+my $last_release = $release;
+my $last_arch    = '';
+
+my $fatal_message = '*** application will terminate ***';
+my $fatal_error;
+
+###############################################################################
+# GUI Main Window
+###############################################################################
+
+my $window  = Gtk3::Window->new('toplevel');
+
+my $grid    = Gtk3::Grid->new();
+
+my $label1  = Gtk3::Label->new('Mirror:');
+my $entry1  = Gtk3::Entry->new();
+
+my $label2  = Gtk3::Label->new('Release:');
+my $entry2  = Gtk3::Entry->new();
+
+my $label3  = Gtk3::Label->new('QA Repo:');
+my $entry3  = Gtk3::Entry->new();
+
+my $label4  = Gtk3::Label->new('Arch:');
+my $entry4  = Gtk3::ComboBoxText->new();
+
+my $label5  = Gtk3::Label->new('RPMs:');
+my $entry5  = Gtk3::TextView->new();
+
+my $scroll  = Gtk3::ScrolledWindow->new();
+
+my $label6  = Gtk3::Label->new('Status:');
+my $status  = Gtk3::Label->new('');
+
+my $button1 = Gtk3::Button->new('Quit');
+my $button2 = Gtk3::Button->new('Disable');
+my $button3 = Gtk3::Button->new('Enable');
+my $button4 = Gtk3::Button->new('Clear');
+my $button5 = Gtk3::Button->new('Downgrade');
+
+my $check0  = Gtk3::CheckButton->new_with_label("core");
+my $check1  = Gtk3::CheckButton->new_with_label("nonfree");
+my $check2  = Gtk3::CheckButton->new_with_label("tainted");
+
+my $check3  = Gtk3::CheckButton->new_with_label("fuzzy\nversion");
+my $check4  = Gtk3::CheckButton->new_with_label("add\ndeps");
+
+$window->set_title("QA Repo  $version");
+$window->set_default_size(600, 400);
+$window->set_border_width(10);
+$window->signal_connect(delete_event => \&quit);
+
+$grid->set_row_spacing(10);
+$grid->set_column_spacing(10);
+
+$label1->set_halign('GTK_ALIGN_END');
+
+$entry1->set_text($mirror);
+$entry1->set_hexpand(TRUE);
+$entry1->signal_connect(changed => \&changed);
+
+$label2->set_halign('GTK_ALIGN_END');
+
+$entry2->set_text($release);
+$entry2->set_width_chars(2);
+$entry2->set_hexpand(TRUE);
+$entry2->signal_connect(changed => \&changed);
+
+$label3->set_halign('GTK_ALIGN_END');
+
+$entry3->set_text($qa_repo);
+$entry3->set_hexpand(TRUE);
+$entry3->signal_connect(changed => \&changed);
+
+$label4->set_halign('GTK_ALIGN_END');
+
+$entry4->append_text('i586');
+$entry4->append_text('x86_64');
+if ($arch eq 'x86_64') {
+    $entry4->set_active(1);
+} else {
+    $entry4->set_active(0);
+}
+$entry4->signal_connect(changed => \&changed);
+
+$label5->set_valign('GTK_ALIGN_START');
+$label5->set_halign('GTK_ALIGN_END');
+
+$entry5->get_buffer->signal_connect(changed => \&changed);
+
+$scroll->set_hexpand(TRUE);
+$scroll->set_vexpand(TRUE);
+$scroll->add($entry5);
+
+$label6->set_halign('GTK_ALIGN_END');
+
+$status->set_halign('GTK_ALIGN_START');
+
+$button1->signal_connect(clicked => \&quit);
+
+$button2->signal_connect(clicked => \&disable);
+
+$button3->signal_connect(clicked => \&enable);
+
+$button4->set_vexpand(TRUE);
+$button4->set_valign('GTK_ALIGN_END');
+$button4->signal_connect(clicked => \&clear);
+
+$button5->signal_connect(clicked => \&downgrade);
+
+$check0->set_active(TRUE);
+$check0->set_sensitive(FALSE);
+
+$check1->set_active($nonfree);
+$check1->signal_connect(clicked => \&changed);
+
+$check2->set_active($tainted);
+$check2->signal_connect(clicked => \&changed);
+
+$check3->set_active(FALSE);
+$check3->signal_connect(clicked => \&changed);
+
+$check4->set_active(FALSE);
+$check4->signal_connect(clicked => \&changed);
+
+$grid->attach($label1, 0, 0, 1, 1);
+$grid->attach($entry1, 1, 0, 5, 1);
+
+$grid->attach($label2, 1, 1, 1, 1);
+$grid->attach($entry2, 2, 1, 1, 1);
+$grid->attach($check0, 3, 1, 1, 1);
+$grid->attach($check1, 4, 1, 1, 1);
+$grid->attach($check2, 5, 1, 1, 1);
+
+$grid->attach($label3, 0, 2, 1, 1);
+$grid->attach($entry3, 1, 2, 4, 1);
+$grid->attach($entry4, 5, 2, 1, 1);
+$grid->attach($label5, 0, 3, 1, 1);
+$grid->attach($scroll, 1, 3, 5, 5);
+$grid->attach($label6, 0, 8, 1, 1);
+$grid->attach($status, 1, 8, 5, 1);
+
+$grid->attach($button1, 7, 0, 1, 1);
+$grid->attach($button2, 7, 2, 1, 1);
+$grid->attach($button3, 7, 3, 1, 1);
+$grid->attach($check3,  7, 4, 1, 1);
+$grid->attach($check4,  7, 5, 1, 1);
+$grid->attach($button4, 7, 6, 1, 1);
+$grid->attach($button5, 7, 7, 1, 1);
+
+$window->add($grid);
+
+###############################################################################
+# GUI Dialogue Window
+###############################################################################
+
+my $dialogue_window = Gtk3::Window->new('toplevel');
+
+my $dialogue_grid   = Gtk3::Grid->new();
+
+my $dialogue_label  = Gtk3::Label->new();
+
+my $dialogue_text   = Gtk3::TextView->new();
+
+my $dialogue_scroll = Gtk3::ScrolledWindow->new();
+
+my $dialogue_button = Gtk3::Button->new('Dismiss');
+
+$dialogue_window->set_default_size(600, 300);
+$dialogue_window->set_border_width(10);
+$dialogue_window->set_type_hint('dialog');
+$dialogue_window->signal_connect(delete_event => \&dialogue_dismiss);
+
+$dialogue_grid->set_row_spacing(10);
+$dialogue_grid->set_column_spacing(10);
+
+$dialogue_label->set_halign('GTK_ALIGN_START');
+
+$dialogue_text->set_editable(FALSE);
+
+$dialogue_scroll->set_hexpand(TRUE);
+$dialogue_scroll->set_vexpand(TRUE);
+$dialogue_scroll->add($dialogue_text);
+
+$dialogue_button->signal_connect(clicked => \&dialogue_dismiss);
+$dialogue_button->set_halign('GTK_ALIGN_CENTER');
+
+$dialogue_grid->attach($dialogue_label,  0, 0, 1, 1);
+$dialogue_grid->attach($dialogue_scroll, 0, 1, 1, 1);
+$dialogue_grid->attach($dialogue_button, 0, 2, 1, 1);
+
+$dialogue_window->add($dialogue_grid);
+
+###############################################################################
+# GUI Start
+###############################################################################
+
+changed();
+
+$window->show_all();
+
+Gtk3->main();
+
+###############################################################################
+# GUI Callbacks
+###############################################################################
+
+sub changed {
+    $arch = trim($entry4->get_active_text());
+    if ($arch ne $last_arch) {
+        $last_arch = $arch;
+        set_qa_repo_info();
+        if ($active_qa_repo) {
+            set_state('enabled');
+        } else {
+            set_state('disabled');
+        }
+    } else {
+        set_state('changed');
+    }
+}
+
+sub quit {
+    get_settings();
+    if (open(my $f, '>', $config_file)) {
+        printf $f "MIRROR=%s\n",  $mirror;
+        printf $f "RELEASE=%s\n", $release;
+        printf $f "ARCH=%s\n",    $arch;
+        printf $f "NONFREE=%d\n", $nonfree;
+        printf $f "TAINTED=%d\n", $tainted;
+        printf $f "QA_REPO=%s\n", $qa_repo;
+        close($f);
+    }
+    Gtk3->main_quit();
+}
+
+sub disable {
+    disable_buttons();
+    disable_repo();
+    set_state('disabled');
+}
+
+sub enable {
+    check_no_testing_media("This may enable unwanted packages to be installed.")
+      or return;
+    disable_buttons();
+    get_settings();
+    if (sync_repo()) {
+        if ($active_qa_repo) {
+            update_repo();
+        } else {
+            enable_repo();
+        }
+    } else {
+        if ($active_qa_repo) {
+            disable_repo();
+        }
+    }
+    if ($active_qa_repo) {
+        set_state('enabled');
+    } else {
+        set_state('failed');
+    }
+}
+
+sub clear {
+    $entry5->get_buffer()->set_text('');
+}
+
+sub downgrade {
+    check_no_testing_media("This may stop some packages from being downgraded.")
+      or return;
+    disable_buttons();
+    if ($active_qa_repo) {
+        disable_repo();
+    }
+    downgrade_packages();
+    set_state('disabled');
+}
+
+sub dialogue_dismiss {
+    if ($fatal_error) {
+        Gtk3->main_quit();
+    } else {
+        $dialogue_window->hide_on_delete()
+    }
+}
+
+###############################################################################
+# Subsidiary Functions
+###############################################################################
+
+sub check_no_testing_media {
+    my ($message2) = @_;
+    if (system("urpmq --list-url | grep -q updates_testing") == 0) {
+        my $message1 = "Some updates_testing media are enabled.";
+        my $message3 = "Please disable these media and try again.";
+        show_error_dialogue(($message1, $message2, $message3));
+        return 0;
+    }
+    1;
+}
+
+sub set_qa_repo_info {
+    $qa_repo_name = $qa_repo_names{$arch};
+
+    my $repo_name_and_url = `urpmq --list-url | grep '$qa_repo_name '`;
+    chomp($repo_name_and_url);
+
+    $active_qa_repo = $repo_name_and_url =~ s/\Q$qa_repo_name\E\s+(\S+)\/$arch/$1/r;
+
+    if ($repo_name_and_url && $active_qa_repo ne $qa_repo) {
+        disable_repo();
+    }
+
+    $entry5->get_buffer->set_text(join("\n", get_existing_rpms()));
+}
+
+sub set_state {
+    my ($new_state) = @_;
+    $state = $new_state;
+    $status->set_label($status_text{$state});
+    $button1->set_sensitive(TRUE);
+    $button2->set_sensitive($active_qa_repo);
+    $button3->set_sensitive($state ne 'enabled');
+    $button4->set_sensitive(TRUE);
+    $button5->set_sensitive($state ne 'changed');
+    if ($state eq 'changed' || $state eq 'failed') {
+        $button3->set_label('Update');
+    } else {
+        $button3->set_label('Enable');
+    }
+}
+
+sub disable_buttons {
+    $button1->set_sensitive(FALSE);
+    $button2->set_sensitive(FALSE);
+    $button3->set_sensitive(FALSE);
+    $button4->set_sensitive(FALSE);
+    $button5->set_sensitive(FALSE);
+    gtk_update();
+}
+
+sub get_settings {
+    $mirror  = trim($entry1->get_text());
+    $release = trim($entry2->get_text());
+    $arch    = trim($entry4->get_active_text());
+    $nonfree = $check1->get_active();
+    $tainted = $check2->get_active();
+    $qa_repo = trim($entry3->get_text());
+    if ($active_qa_repo && $active_qa_repo ne $qa_repo) {
+        disable_repo();
+    }
+}
+
+sub get_requested_rpms {
+    my $buffer = $entry5->get_buffer();
+    my $start  = $buffer->get_start_iter();
+    my $end    = $buffer->get_end_iter();
+
+    my $fuzzy_version = $check3->get_active();
+
+    my @lines = split("\n", $buffer->get_text($start, $end, FALSE));
+    if ($fuzzy_version) {
+        # replace version-release with wildcard
+        s/-\d.*-.+(\.mga$release(?:(?:\.$arch|\.noarch)(?:\.rpm)?)?)$/-\\d*$1/ foreach @lines;
+    }
+    s/^\s+// foreach @lines;  # trim leading white space
+    s/\s+$// foreach @lines;  # trim trailing white space
+    grep { $_ ne '' } @lines; # and discard blank lines
+}
+
+sub get_existing_rpms {
+    map { basename($_) } glob("$qa_repo/$arch/*.rpm");
+}
+
+sub disable_repo {
+    my $arch_type = $arch eq 'x86_64' ? '64' : '32';
+    if (system("$pkexec /usr/libexec/qarepo-helper disable $arch_type") == 0) {
+        $active_qa_repo = '';
+    } else {
+        my $message = "couldn't disable the $qa_repo_name media";
+        show_error_dialogue($message, $fatal_message);
+        print_error($message, 'fatal');
+    }
+}
+
+sub enable_repo {
+    my $arch_type = $arch eq 'x86_64' ? '64' : '32';
+    if (system("$pkexec /usr/libexec/qarepo-helper enable $arch_type $qa_repo/$arch") == 0) {
+        $active_qa_repo = $qa_repo;
+    } else {
+        my $message = "couldn't enable the $qa_repo_name media";
+        show_error_dialogue($message);
+        print_error($message);
+        $active_qa_repo = '';
+    }
+}
+
+sub update_repo {
+    my $arch_type = $arch eq 'x86_64' ? '64' : '32';
+    if (system("$pkexec /usr/libexec/qarepo-helper update $arch_type") != 0) {
+        my $message = "couldn't update the $qa_repo_name media";
+        show_error_dialogue($message);
+        print_error($message);
+        disable_repo();
+    }
+}
+
+sub clear_repo {
+    my ($type) = @_;
+    my @existing_rpms = grep { $_ =~ /$type/ } get_existing_rpms();
+    if (@existing_rpms) {
+        if (!unlink(map { "$qa_repo/$arch/$_" } @existing_rpms)) {
+            my $message = "couldn't delete existing RPMs in the QA repo";
+            show_error_dialogue($message, $fatal_message);
+            print_error($message, 'fatal');
+        }
+    }
+}
+
+my @sync_errors;
+
+sub sync_repo {
+    $status->set_label('Updating');
+    @sync_errors = ();
+
+    my $sync_file;
+    if      ($mirror =~ /^rsync:/) {
+        $sync_file = \&sync_file_rsync;
+    } elsif ($mirror =~ /^ftp:/ || $mirror =~ /^http:/) {
+        $sync_file = \&sync_file_aria2;
+    } elsif ($mirror !~ /^\w+:/) {
+        $sync_file = \&sync_file_link;
+    } else {
+        my $message = "unsupported mirror URL type";
+        show_error_dialogue($message);
+        print_error($message);
+        return 0;
+    }
+
+    if ($release ne $last_release) {
+        $last_release = $release;
+        clear_repo();
+        gtk_update();
+    }
+
+    my $add_dependencies = $check4->get_active();
+
+    my $remote_repo = "$mirror/distrib/$release/$arch/media";
+    my $local_repo  = "$qa_repo/$arch";
+
+    my @mediatypes = ( 'core' );
+    push @mediatypes, 'nonfree' if $nonfree;
+    push @mediatypes, 'tainted' if $tainted;
+
+    my $download_dir = "$qa_repo/.download";
+    mkdir_p($download_dir);
+
+    my %rpm_dependencies;
+    foreach my $media_type (@mediatypes) {
+        my $synthesis = 'synthesis.hdlist.cz';
+        my $remote_dir = "$remote_repo/$media_type/updates_testing/media_info";
+        &$sync_file("$remote_dir/$synthesis", $download_dir) or next;
+        gtk_update();
+
+        my $urpm = new URPM;
+        $urpm->parse_synthesis("$download_dir/$synthesis");
+        $urpm->traverse(sub {
+            my ($pkg) = @_;
+            my $name = $pkg->fullname();
+            my $rpm = "$name.rpm";
+            %{$rpm_dependencies{$rpm}} = ();
+            if ($add_dependencies) {
+                my @requires = ( $pkg->requires_nosense(), $pkg->recommends_nosense );
+                $urpm->traverse_tag('whatprovides', \@requires, sub {
+                    my ($pkg) = @_;
+                    my $name = $pkg->fullname();
+                    ${$rpm_dependencies{$rpm}}{"$name.rpm"} = 1;
+                });
+            }
+        });
+
+        if (!unlink("$download_dir/$synthesis")) {
+            my $message = "couldn't delete $download_dir/$synthesis in the QA repo";
+            show_error_dialogue($message, $fatal_message);
+            print_error($message, 'fatal');
+        }
+        gtk_update();
+    }
+
+    my %selection;
+    my @requests = get_requested_rpms();
+    while (@requests) {
+        foreach my $request (@requests) {
+            my $pattern = wildcard_to_regexp($request);
+            my $matched = 0;
+            foreach my $candidate (keys %rpm_dependencies) {
+                if ($candidate =~ /^($pattern)((\.($arch|noarch))?\.rpm)?$/) {
+                    $selection{$candidate} = 1;
+                    $selection{$_} ||= 2 foreach keys %{$rpm_dependencies{$candidate}};
+                    $matched = 1;
+                }
+            }
+            $matched or sync_error("$request not found in the remote repository");
+        }
+        # avoid infinite loop if we haven't found a match
+        last if @sync_errors;
+        # recurse through any new dependencies
+        @requests = grep { $selection{$_} == 2 } keys %selection;
+    }
+
+    if (@sync_errors) {
+        show_error_dialogue(@sync_errors);
+        return 0;
+    }
+
+    my @required_rpms = sort keys %selection;
+    my @existing_rpms = get_existing_rpms();
+    my @unwanted_rpms = difference2(\@existing_rpms, \@required_rpms);
+    if (@unwanted_rpms) {
+        if (!unlink(map { "$local_repo/$_" } @unwanted_rpms)) {
+            my $message = "couldn't delete unwanted RPMs in the QA repo";
+            show_error_dialogue($message, $fatal_message);
+            print_error($message, 'fatal');
+        }
+    }
+    my $old_pubkey = "$local_repo/media_info/pubkey";
+    if (-e $old_pubkey) {
+        if (!unlink($old_pubkey)) {
+            my $message = "couldn't delete old pubkey in the QA repo";
+            show_error_dialogue($message, $fatal_message);
+            print_error($message, 'fatal');
+        }
+    }
+
+    mkdir_p("$local_repo/media_info");
+    gtk_update();
+
+    foreach my $rpm (difference2(\@required_rpms, \@existing_rpms)) {
+        my $remote_url = $remote_repo;
+        if ($rpm =~ /tainted/) {
+            $remote_url .= "/tainted/updates_testing/$rpm";
+        } elsif ($rpm =~ /nonfree/) {
+            $remote_url .= "/nonfree/updates_testing/$rpm";
+        } else {
+            $remote_url .= "/core/updates_testing/$rpm";
+        }
+        &$sync_file($remote_url, $local_repo);
+        gtk_update();
+    }
+    &$sync_file("$remote_repo/core/updates_testing/media_info/pubkey", "$local_repo/media_info");
+    gtk_update();
+
+    if (@sync_errors) {
+        print_error('failed to download all the files');
+    } else {
+        system("genhdlist2 --allow-empty-media $local_repo") == 0
+          or sync_error("failed to update hdlist");
+    }
+
+    if (@sync_errors) {
+        show_error_dialogue(@sync_errors);
+        return 0;
+    }
+
+    1;
+}
+
+sub sync_file_rsync {
+    my ($src_url, $dst_dir) = @_;
+    print "fetching $src_url\n";
+    system("rsync -q $src_url $dst_dir") == 0
+      or sync_error("failed to download $src_url");
+}
+
+sub sync_file_aria2 {
+    my ($src_url, $dst_dir) = @_;
+    print "fetching $src_url\n";
+    system("aria2c -q -d $dst_dir $src_url") == 0
+      and return 1;
+
+    # aria2c leaves empty or partially downloaded files.
+    my $dst_file = $dst_dir . '/' . basename($src_url);
+    unlink($dst_file) if -e $dst_file;
+
+    sync_error("failed to download $src_url");
+}
+
+sub sync_file_link {
+    my ($src_file, $dst_dir) = @_;
+    -e $src_file && symlink($src_file, $dst_dir . '/' . basename($src_file))
+      or sync_error("failed to link $src_file");
+}
+
+sub sync_error {
+    my ($message) = @_;
+    push @sync_errors, $message;
+    print_error($message);
+    0;
+}
+
+sub downgrade_packages {
+    my $synthesis = "$qa_repo/$arch/media_info/synthesis.hdlist.cz";
+    if (! -e $synthesis) {
+        my $message = "no synthesis file found in local repository";
+        show_error_dialogue($message);
+        print_error($message);
+        return 0;
+    }
+
+    my @packages;
+    my $urpm = new URPM;
+    $urpm->parse_synthesis($synthesis);
+    $urpm->traverse(sub {
+        my ($pkg) = @_;
+        my $full_name = $pkg->fullname;
+        if (system("rpm --quiet -q $full_name") == 0) {
+            push @packages, $pkg->name();
+        }
+    });
+
+    if (@packages) {
+        @packages = sort @packages;
+        show_downgrade_dialogue("urpmi --update --downgrade @packages");
+    } else {
+        show_error_dialogue("none of the listed packages are installed");
+    }
+}
+
+sub trim {
+    my ($text) = @_;
+    $text =~ s/^\s+//;
+    $text =~ s/\s+$//;
+    $text;
+}
+
+sub wildcard_to_regexp {
+    my ($pattern) = @_;
+    $pattern =~ s/\./\\./g;
+    $pattern =~ s/\+/\\+/g;
+    $pattern =~ s/\*/.*/g;
+    $pattern =~ s/\?/./g;
+    $pattern;
+}
+
+sub show_downgrade_dialogue {
+    $dialogue_window->set_title('Downgrade');
+    $dialogue_label->set_text('The following command may be used to downgrade the listed packages:');
+    $dialogue_text->get_buffer()->set_text(join("\n", @_));
+    $dialogue_text->set_wrap_mode('GTK_WRAP_WORD_CHAR');
+    $dialogue_window->show_all();
+}
+
+sub show_error_dialogue {
+    $dialogue_window->set_title('Error');
+    $dialogue_label->set_text('The following error(s) occurred:');
+    $dialogue_text->get_buffer()->set_text(join("\n", @_));
+    $dialogue_text->set_wrap_mode('GTK_WRAP_NONE');
+    $dialogue_window->show_all();
+}
+
+sub print_error {
+    my ($message, $o_fatal) = @_;
+    print "ERROR: $message.\n";
+    $fatal_error = $o_fatal;
+}
+
+sub gtk_update {
+    while (Gtk3::events_pending()) {
+        Gtk3::main_iteration();
+    }
+}
diff --git a/qarepo.pl b/qarepo.pl
deleted file mode 100644
index bc49731..0000000
--- a/qarepo.pl
+++ /dev/null
@@ -1,753 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2018 Mageia
-#                    Martin Whitaker <mageia@martin-whitaker.me.uk>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA.
-
-use strict;
-use warnings;
-
-use Glib qw(TRUE FALSE);
-use Gtk3 '-init';
-use MDK::Common;
-use URPM;
-
-my $version = 'v1.5';
-
-###############################################################################
-# States and Status
-###############################################################################
-
-my %status_text = (
-    disabled => 'Disabled',
-    enabled  => 'Enabled',
-    changed  => 'Needs update',
-    failed   => 'Update failed'
-);
-
-my $state;
-
-###############################################################################
-# Initial Configuration
-###############################################################################
-
-my $home = $ENV{HOME} || './';
-
-# Only use pkexec if not run by root.
-my $pkexec = $> ? 'pkexec' : '';
-
-my %config;
-
-# Settings are stored in the config file in key=value format.
-my $config_file = "$home/.qareporc";
-if (open(my $f, '<', $config_file)) {
-    while (my $line = <$f>) {
-        chomp($line);
-        my ($key, $value) = split(/=/, $line);
-        $config{$key} = $value if $key;
-    }
-    close($f);
-}
-
-# Use sensible defaults for settings not in the config file.
-my $mirror  = $config{MIRROR}  // 'rsync://mirrors.kernel.org/mirrors/mageia';
-my $release = $config{RELEASE} // '6';
-my $arch    = $config{ARCH}    // 'x86_64';
-my $nonfree = $config{NONFREE} // 1;
-my $tainted = $config{TAINTED} // 1;
-my $qa_repo = $config{QA_REPO} // "$home/qa-testing";
-
-my %qa_repo_names = (
-    i586   => 'QA Testing (32-bit)',
-    x86_64 => 'QA Testing (64-bit)'
-);
-
-my $qa_repo_name;
-my $active_qa_repo;
-
-my $last_release = $release;
-my $last_arch    = '';
-
-my $fatal_message = '*** application will terminate ***';
-my $fatal_error;
-
-###############################################################################
-# GUI Main Window
-###############################################################################
-
-my $window  = Gtk3::Window->new('toplevel');
-
-my $grid    = Gtk3::Grid->new();
-
-my $label1  = Gtk3::Label->new('Mirror:');
-my $entry1  = Gtk3::Entry->new();
-
-my $label2  = Gtk3::Label->new('Release:');
-my $entry2  = Gtk3::Entry->new();
-
-my $label3  = Gtk3::Label->new('QA Repo:');
-my $entry3  = Gtk3::Entry->new();
-
-my $label4  = Gtk3::Label->new('Arch:');
-my $entry4  = Gtk3::ComboBoxText->new();
-
-my $label5  = Gtk3::Label->new('RPMs:');
-my $entry5  = Gtk3::TextView->new();
-
-my $scroll  = Gtk3::ScrolledWindow->new();
-
-my $label6  = Gtk3::Label->new('Status:');
-my $status  = Gtk3::Label->new('');
-
-my $button1 = Gtk3::Button->new('Quit');
-my $button2 = Gtk3::Button->new('Disable');
-my $button3 = Gtk3::Button->new('Enable');
-my $button4 = Gtk3::Button->new('Clear');
-my $button5 = Gtk3::Button->new('Downgrade');
-
-my $check0  = Gtk3::CheckButton->new_with_label("core");
-my $check1  = Gtk3::CheckButton->new_with_label("nonfree");
-my $check2  = Gtk3::CheckButton->new_with_label("tainted");
-
-my $check3  = Gtk3::CheckButton->new_with_label("fuzzy\nversion");
-my $check4  = Gtk3::CheckButton->new_with_label("add\ndeps");
-
-$window->set_title("QA Repo  $version");
-$window->set_default_size(600, 400);
-$window->set_border_width(10);
-$window->signal_connect(delete_event => \&quit);
-
-$grid->set_row_spacing(10);
-$grid->set_column_spacing(10);
-
-$label1->set_halign('GTK_ALIGN_END');
-
-$entry1->set_text($mirror);
-$entry1->set_hexpand(TRUE);
-$entry1->signal_connect(changed => \&changed);
-
-$label2->set_halign('GTK_ALIGN_END');
-
-$entry2->set_text($release);
-$entry2->set_width_chars(2);
-$entry2->set_hexpand(TRUE);
-$entry2->signal_connect(changed => \&changed);
-
-$label3->set_halign('GTK_ALIGN_END');
-
-$entry3->set_text($qa_repo);
-$entry3->set_hexpand(TRUE);
-$entry3->signal_connect(changed => \&changed);
-
-$label4->set_halign('GTK_ALIGN_END');
-
-$entry4->append_text('i586');
-$entry4->append_text('x86_64');
-if ($arch eq 'x86_64') {
-    $entry4->set_active(1);
-} else {
-    $entry4->set_active(0);
-}
-$entry4->signal_connect(changed => \&changed);
-
-$label5->set_valign('GTK_ALIGN_START');
-$label5->set_halign('GTK_ALIGN_END');
-
-$entry5->get_buffer->signal_connect(changed => \&changed);
-
-$scroll->set_hexpand(TRUE);
-$scroll->set_vexpand(TRUE);
-$scroll->add($entry5);
-
-$label6->set_halign('GTK_ALIGN_END');
-
-$status->set_halign('GTK_ALIGN_START');
-
-$button1->signal_connect(clicked => \&quit);
-
-$button2->signal_connect(clicked => \&disable);
-
-$button3->signal_connect(clicked => \&enable);
-
-$button4->set_vexpand(TRUE);
-$button4->set_valign('GTK_ALIGN_END');
-$button4->signal_connect(clicked => \&clear);
-
-$button5->signal_connect(clicked => \&downgrade);
-
-$check0->set_active(TRUE);
-$check0->set_sensitive(FALSE);
-
-$check1->set_active($nonfree);
-$check1->signal_connect(clicked => \&changed);
-
-$check2->set_active($tainted);
-$check2->signal_connect(clicked => \&changed);
-
-$check3->set_active(FALSE);
-$check3->signal_connect(clicked => \&changed);
-
-$check4->set_active(FALSE);
-$check4->signal_connect(clicked => \&changed);
-
-$grid->attach($label1, 0, 0, 1, 1);
-$grid->attach($entry1, 1, 0, 5, 1);
-
-$grid->attach($label2, 1, 1, 1, 1);
-$grid->attach($entry2, 2, 1, 1, 1);
-$grid->attach($check0, 3, 1, 1, 1);
-$grid->attach($check1, 4, 1, 1, 1);
-$grid->attach($check2, 5, 1, 1, 1);
-
-$grid->attach($label3, 0, 2, 1, 1);
-$grid->attach($entry3, 1, 2, 4, 1);
-$grid->attach($entry4, 5, 2, 1, 1);
-$grid->attach($label5, 0, 3, 1, 1);
-$grid->attach($scroll, 1, 3, 5, 5);
-$grid->attach($label6, 0, 8, 1, 1);
-$grid->attach($status, 1, 8, 5, 1);
-
-$grid->attach($button1, 7, 0, 1, 1);
-$grid->attach($button2, 7, 2, 1, 1);
-$grid->attach($button3, 7, 3, 1, 1);
-$grid->attach($check3,  7, 4, 1, 1);
-$grid->attach($check4,  7, 5, 1, 1);
-$grid->attach($button4, 7, 6, 1, 1);
-$grid->attach($button5, 7, 7, 1, 1);
-
-$window->add($grid);
-
-###############################################################################
-# GUI Dialogue Window
-###############################################################################
-
-my $dialogue_window = Gtk3::Window->new('toplevel');
-
-my $dialogue_grid   = Gtk3::Grid->new();
-
-my $dialogue_label  = Gtk3::Label->new();
-
-my $dialogue_text   = Gtk3::TextView->new();
-
-my $dialogue_scroll = Gtk3::ScrolledWindow->new();
-
-my $dialogue_button = Gtk3::Button->new('Dismiss');
-
-$dialogue_window->set_default_size(600, 300);
-$dialogue_window->set_border_width(10);
-$dialogue_window->set_type_hint('dialog');
-$dialogue_window->signal_connect(delete_event => \&dialogue_dismiss);
-
-$dialogue_grid->set_row_spacing(10);
-$dialogue_grid->set_column_spacing(10);
-
-$dialogue_label->set_halign('GTK_ALIGN_START');
-
-$dialogue_text->set_editable(FALSE);
-
-$dialogue_scroll->set_hexpand(TRUE);
-$dialogue_scroll->set_vexpand(TRUE);
-$dialogue_scroll->add($dialogue_text);
-
-$dialogue_button->signal_connect(clicked => \&dialogue_dismiss);
-$dialogue_button->set_halign('GTK_ALIGN_CENTER');
-
-$dialogue_grid->attach($dialogue_label,  0, 0, 1, 1);
-$dialogue_grid->attach($dialogue_scroll, 0, 1, 1, 1);
-$dialogue_grid->attach($dialogue_button, 0, 2, 1, 1);
-
-$dialogue_window->add($dialogue_grid);
-
-###############################################################################
-# GUI Start
-###############################################################################
-
-changed();
-
-$window->show_all();
-
-Gtk3->main();
-
-###############################################################################
-# GUI Callbacks
-###############################################################################
-
-sub changed {
-    $arch = trim($entry4->get_active_text());
-    if ($arch ne $last_arch) {
-        $last_arch = $arch;
-        set_qa_repo_info();
-        if ($active_qa_repo) {
-            set_state('enabled');
-        } else {
-            set_state('disabled');
-        }
-    } else {
-        set_state('changed');
-    }
-}
-
-sub quit {
-    get_settings();
-    if (open(my $f, '>', $config_file)) {
-        printf $f "MIRROR=%s\n",  $mirror;
-        printf $f "RELEASE=%s\n", $release;
-        printf $f "ARCH=%s\n",    $arch;
-        printf $f "NONFREE=%d\n", $nonfree;
-        printf $f "TAINTED=%d\n", $tainted;
-        printf $f "QA_REPO=%s\n", $qa_repo;
-        close($f);
-    }
-    Gtk3->main_quit();
-}
-
-sub disable {
-    disable_buttons();
-    disable_repo();
-    set_state('disabled');
-}
-
-sub enable {
-    check_no_testing_media("This may enable unwanted packages to be installed.")
-      or return;
-    disable_buttons();
-    get_settings();
-    if (sync_repo()) {
-        if ($active_qa_repo) {
-            update_repo();
-        } else {
-            enable_repo();
-        }
-    } else {
-        if ($active_qa_repo) {
-            disable_repo();
-        }
-    }
-    if ($active_qa_repo) {
-        set_state('enabled');
-    } else {
-        set_state('failed');
-    }
-}
-
-sub clear {
-    $entry5->get_buffer()->set_text('');
-}
-
-sub downgrade {
-    check_no_testing_media("This may stop some packages from being downgraded.")
-      or return;
-    disable_buttons();
-    if ($active_qa_repo) {
-        disable_repo();
-    }
-    downgrade_packages();
-    set_state('disabled');
-}
-
-sub dialogue_dismiss {
-    if ($fatal_error) {
-        Gtk3->main_quit();
-    } else {
-        $dialogue_window->hide_on_delete()
-    }
-}
-
-###############################################################################
-# Subsidiary Functions
-###############################################################################
-
-sub check_no_testing_media {
-    my ($message2) = @_;
-    if (system("urpmq --list-url | grep -q updates_testing") == 0) {
-        my $message1 = "Some updates_testing media are enabled.";
-        my $message3 = "Please disable these media and try again.";
-        show_error_dialogue(($message1, $message2, $message3));
-        return 0;
-    }
-    1;
-}
-
-sub set_qa_repo_info {
-    $qa_repo_name = $qa_repo_names{$arch};
-
-    my $repo_name_and_url = `urpmq --list-url | grep '$qa_repo_name '`;
-    chomp($repo_name_and_url);
-
-    $active_qa_repo = $repo_name_and_url =~ s/\Q$qa_repo_name\E\s+(\S+)\/$arch/$1/r;
-
-    if ($repo_name_and_url && $active_qa_repo ne $qa_repo) {
-        disable_repo();
-    }
-
-    $entry5->get_buffer->set_text(join("\n", get_existing_rpms()));
-}
-
-sub set_state {
-    my ($new_state) = @_;
-    $state = $new_state;
-    $status->set_label($status_text{$state});
-    $button1->set_sensitive(TRUE);
-    $button2->set_sensitive($active_qa_repo);
-    $button3->set_sensitive($state ne 'enabled');
-    $button4->set_sensitive(TRUE);
-    $button5->set_sensitive($state ne 'changed');
-    if ($state eq 'changed' || $state eq 'failed') {
-        $button3->set_label('Update');
-    } else {
-        $button3->set_label('Enable');
-    }
-}
-
-sub disable_buttons {
-    $button1->set_sensitive(FALSE);
-    $button2->set_sensitive(FALSE);
-    $button3->set_sensitive(FALSE);
-    $button4->set_sensitive(FALSE);
-    $button5->set_sensitive(FALSE);
-    gtk_update();
-}
-
-sub get_settings {
-    $mirror  = trim($entry1->get_text());
-    $release = trim($entry2->get_text());
-    $arch    = trim($entry4->get_active_text());
-    $nonfree = $check1->get_active();
-    $tainted = $check2->get_active();
-    $qa_repo = trim($entry3->get_text());
-    if ($active_qa_repo && $active_qa_repo ne $qa_repo) {
-        disable_repo();
-    }
-}
-
-sub get_requested_rpms {
-    my $buffer = $entry5->get_buffer();
-    my $start  = $buffer->get_start_iter();
-    my $end    = $buffer->get_end_iter();
-
-    my $fuzzy_version = $check3->get_active();
-
-    my @lines = split("\n", $buffer->get_text($start, $end, FALSE));
-    if ($fuzzy_version) {
-        # replace version-release with wildcard
-        s/-\d.*-.+(\.mga$release(?:(?:\.$arch|\.noarch)(?:\.rpm)?)?)$/-\\d*$1/ foreach @lines;
-    }
-    s/^\s+// foreach @lines;  # trim leading white space
-    s/\s+$// foreach @lines;  # trim trailing white space
-    grep { $_ ne '' } @lines; # and discard blank lines
-}
-
-sub get_existing_rpms {
-    map { basename($_) } glob("$qa_repo/$arch/*.rpm");
-}
-
-sub disable_repo {
-    my $arch_type = $arch eq 'x86_64' ? '64' : '32';
-    if (system("$pkexec /usr/libexec/qarepo-helper disable $arch_type") == 0) {
-        $active_qa_repo = '';
-    } else {
-        my $message = "couldn't disable the $qa_repo_name media";
-        show_error_dialogue($message, $fatal_message);
-        print_error($message, 'fatal');
-    }
-}
-
-sub enable_repo {
-    my $arch_type = $arch eq 'x86_64' ? '64' : '32';
-    if (system("$pkexec /usr/libexec/qarepo-helper enable $arch_type $qa_repo/$arch") == 0) {
-        $active_qa_repo = $qa_repo;
-    } else {
-        my $message = "couldn't enable the $qa_repo_name media";
-        show_error_dialogue($message);
-        print_error($message);
-        $active_qa_repo = '';
-    }
-}
-
-sub update_repo {
-    my $arch_type = $arch eq 'x86_64' ? '64' : '32';
-    if (system("$pkexec /usr/libexec/qarepo-helper update $arch_type") != 0) {
-        my $message = "couldn't update the $qa_repo_name media";
-        show_error_dialogue($message);
-        print_error($message);
-        disable_repo();
-    }
-}
-
-sub clear_repo {
-    my ($type) = @_;
-    my @existing_rpms = grep { $_ =~ /$type/ } get_existing_rpms();
-    if (@existing_rpms) {
-        if (!unlink(map { "$qa_repo/$arch/$_" } @existing_rpms)) {
-            my $message = "couldn't delete existing RPMs in the QA repo";
-            show_error_dialogue($message, $fatal_message);
-            print_error($message, 'fatal');
-        }
-    }
-}
-
-my @sync_errors;
-
-sub sync_repo {
-    $status->set_label('Updating');
-    @sync_errors = ();
-
-    my $sync_file;
-    if      ($mirror =~ /^rsync:/) {
-        $sync_file = \&sync_file_rsync;
-    } elsif ($mirror =~ /^ftp:/ || $mirror =~ /^http:/) {
-        $sync_file = \&sync_file_aria2;
-    } elsif ($mirror !~ /^\w+:/) {
-        $sync_file = \&sync_file_link;
-    } else {
-        my $message = "unsupported mirror URL type";
-        show_error_dialogue($message);
-        print_error($message);
-        return 0;
-    }
-
-    if ($release ne $last_release) {
-        $last_release = $release;
-        clear_repo();
-        gtk_update();
-    }
-
-    my $add_dependencies = $check4->get_active();
-
-    my $remote_repo = "$mirror/distrib/$release/$arch/media";
-    my $local_repo  = "$qa_repo/$arch";
-
-    my @mediatypes = ( 'core' );
-    push @mediatypes, 'nonfree' if $nonfree;
-    push @mediatypes, 'tainted' if $tainted;
-
-    my $download_dir = "$qa_repo/.download";
-    mkdir_p($download_dir);
-
-    my %rpm_dependencies;
-    foreach my $media_type (@mediatypes) {
-        my $synthesis = 'synthesis.hdlist.cz';
-        my $remote_dir = "$remote_repo/$media_type/updates_testing/media_info";
-        &$sync_file("$remote_dir/$synthesis", $download_dir) or next;
-        gtk_update();
-
-        my $urpm = new URPM;
-        $urpm->parse_synthesis("$download_dir/$synthesis");
-        $urpm->traverse(sub {
-            my ($pkg) = @_;
-            my $name = $pkg->fullname();
-            my $rpm = "$name.rpm";
-            %{$rpm_dependencies{$rpm}} = ();
-            if ($add_dependencies) {
-                my @requires = ( $pkg->requires_nosense(), $pkg->recommends_nosense );
-                $urpm->traverse_tag('whatprovides', \@requires, sub {
-                    my ($pkg) = @_;
-                    my $name = $pkg->fullname();
-                    ${$rpm_dependencies{$rpm}}{"$name.rpm"} = 1;
-                });
-            }
-        });
-
-        if (!unlink("$download_dir/$synthesis")) {
-            my $message = "couldn't delete $download_dir/$synthesis in the QA repo";
-            show_error_dialogue($message, $fatal_message);
-            print_error($message, 'fatal');
-        }
-        gtk_update();
-    }
-
-    my %selection;
-    my @requests = get_requested_rpms();
-    while (@requests) {
-        foreach my $request (@requests) {
-            my $pattern = wildcard_to_regexp($request);
-            my $matched = 0;
-            foreach my $candidate (keys %rpm_dependencies) {
-                if ($candidate =~ /^($pattern)((\.($arch|noarch))?\.rpm)?$/) {
-                    $selection{$candidate} = 1;
-                    $selection{$_} ||= 2 foreach keys %{$rpm_dependencies{$candidate}};
-                    $matched = 1;
-                }
-            }
-            $matched or sync_error("$request not found in the remote repository");
-        }
-        # avoid infinite loop if we haven't found a match
-        last if @sync_errors;
-        # recurse through any new dependencies
-        @requests = grep { $selection{$_} == 2 } keys %selection;
-    }
-
-    if (@sync_errors) {
-        show_error_dialogue(@sync_errors);
-        return 0;
-    }
-
-    my @required_rpms = sort keys %selection;
-    my @existing_rpms = get_existing_rpms();
-    my @unwanted_rpms = difference2(\@existing_rpms, \@required_rpms);
-    if (@unwanted_rpms) {
-        if (!unlink(map { "$local_repo/$_" } @unwanted_rpms)) {
-            my $message = "couldn't delete unwanted RPMs in the QA repo";
-            show_error_dialogue($message, $fatal_message);
-            print_error($message, 'fatal');
-        }
-    }
-    my $old_pubkey = "$local_repo/media_info/pubkey";
-    if (-e $old_pubkey) {
-        if (!unlink($old_pubkey)) {
-            my $message = "couldn't delete old pubkey in the QA repo";
-            show_error_dialogue($message, $fatal_message);
-            print_error($message, 'fatal');
-        }
-    }
-
-    mkdir_p("$local_repo/media_info");
-    gtk_update();
-
-    foreach my $rpm (difference2(\@required_rpms, \@existing_rpms)) {
-        my $remote_url = $remote_repo;
-        if ($rpm =~ /tainted/) {
-            $remote_url .= "/tainted/updates_testing/$rpm";
-        } elsif ($rpm =~ /nonfree/) {
-            $remote_url .= "/nonfree/updates_testing/$rpm";
-        } else {
-            $remote_url .= "/core/updates_testing/$rpm";
-        }
-        &$sync_file($remote_url, $local_repo);
-        gtk_update();
-    }
-    &$sync_file("$remote_repo/core/updates_testing/media_info/pubkey", "$local_repo/media_info");
-    gtk_update();
-
-    if (@sync_errors) {
-        print_error('failed to download all the files');
-    } else {
-        system("genhdlist2 --allow-empty-media $local_repo") == 0
-          or sync_error("failed to update hdlist");
-    }
-
-    if (@sync_errors) {
-        show_error_dialogue(@sync_errors);
-        return 0;
-    }
-
-    1;
-}
-
-sub sync_file_rsync {
-    my ($src_url, $dst_dir) = @_;
-    print "fetching $src_url\n";
-    system("rsync -q $src_url $dst_dir") == 0
-      or sync_error("failed to download $src_url");
-}
-
-sub sync_file_aria2 {
-    my ($src_url, $dst_dir) = @_;
-    print "fetching $src_url\n";
-    system("aria2c -q -d $dst_dir $src_url") == 0
-      and return 1;
-
-    # aria2c leaves empty or partially downloaded files.
-    my $dst_file = $dst_dir . '/' . basename($src_url);
-    unlink($dst_file) if -e $dst_file;
-
-    sync_error("failed to download $src_url");
-}
-
-sub sync_file_link {
-    my ($src_file, $dst_dir) = @_;
-    -e $src_file && symlink($src_file, $dst_dir . '/' . basename($src_file))
-      or sync_error("failed to link $src_file");
-}
-
-sub sync_error {
-    my ($message) = @_;
-    push @sync_errors, $message;
-    print_error($message);
-    0;
-}
-
-sub downgrade_packages {
-    my $synthesis = "$qa_repo/$arch/media_info/synthesis.hdlist.cz";
-    if (! -e $synthesis) {
-        my $message = "no synthesis file found in local repository";
-        show_error_dialogue($message);
-        print_error($message);
-        return 0;
-    }
-
-    my @packages;
-    my $urpm = new URPM;
-    $urpm->parse_synthesis($synthesis);
-    $urpm->traverse(sub {
-        my ($pkg) = @_;
-        my $full_name = $pkg->fullname;
-        if (system("rpm --quiet -q $full_name") == 0) {
-            push @packages, $pkg->name();
-        }
-    });
-
-    if (@packages) {
-        @packages = sort @packages;
-        show_downgrade_dialogue("urpmi --update --downgrade @packages");
-    } else {
-        show_error_dialogue("none of the listed packages are installed");
-    }
-}
-
-sub trim {
-    my ($text) = @_;
-    $text =~ s/^\s+//;
-    $text =~ s/\s+$//;
-    $text;
-}
-
-sub wildcard_to_regexp {
-    my ($pattern) = @_;
-    $pattern =~ s/\./\\./g;
-    $pattern =~ s/\+/\\+/g;
-    $pattern =~ s/\*/.*/g;
-    $pattern =~ s/\?/./g;
-    $pattern;
-}
-
-sub show_downgrade_dialogue {
-    $dialogue_window->set_title('Downgrade');
-    $dialogue_label->set_text('The following command may be used to downgrade the listed packages:');
-    $dialogue_text->get_buffer()->set_text(join("\n", @_));
-    $dialogue_text->set_wrap_mode('GTK_WRAP_WORD_CHAR');
-    $dialogue_window->show_all();
-}
-
-sub show_error_dialogue {
-    $dialogue_window->set_title('Error');
-    $dialogue_label->set_text('The following error(s) occurred:');
-    $dialogue_text->get_buffer()->set_text(join("\n", @_));
-    $dialogue_text->set_wrap_mode('GTK_WRAP_NONE');
-    $dialogue_window->show_all();
-}
-
-sub print_error {
-    my ($message, $o_fatal) = @_;
-    print "ERROR: $message.\n";
-    $fatal_error = $o_fatal;
-}
-
-sub gtk_update {
-    while (Gtk3::events_pending()) {
-        Gtk3::main_iteration();
-    }
-}
-- 
cgit v1.2.1


From 34304504466eac7e9f3fcd592f0d2f84d42f0c39 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 13 Nov 2018 20:54:13 +0000
Subject: Add desktop file.

---
 qarepo.desktop | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 qarepo.desktop

diff --git a/qarepo.desktop b/qarepo.desktop
new file mode 100644
index 0000000..bb4bdcb
--- /dev/null
+++ b/qarepo.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=QA Repo
+Comment=Tool for creating a local testing repository
+Type=Application
+Terminal=false
+Icon=mageia
+Exec=/usr/bin/qarepo
+Categories=Utility;X-MageiaLinux-CrossDesktop;
-- 
cgit v1.2.1


From c0590b5ea59cd5749f04fc296570e4e7b6d5ff9f Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 13 Nov 2018 23:11:05 +0000
Subject: Add Makefile and NEWS.

---
 Makefile | 26 ++++++++++++++++++++++++++
 NEWS     | 11 +++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 Makefile
 create mode 100644 NEWS

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..c33f1e7
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,26 @@
+NAME = qarepo
+VERSION = 1.6
+
+DESTDIR=
+
+all:
+	sed -i "s/version = '.*';/version = 'v${VERSION}';/" qarepo
+
+check:
+	perl -cw qarepo
+
+install:
+	install -d $(DESTDIR)/usr/bin
+	install -d $(DESTDIR)/usr/libexec
+	install -d $(DESTDIR)/usr/share/applications
+	install -d $(DESTDIR)/usr/share/polkit-1/actions
+	install -d $(DESTDIR)/usr/share/polkit-1/rules.d
+	install -m 0755 qarepo $(DESTDIR)/usr/bin
+	install -m 0755 qarepo-helper $(DESTDIR)/usr/libexec
+	install -m 0644 qarepo.desktop $(DESTDIR)/usr/share/applications
+	install -m 0644 org.mageia.qarepo-helper.policy $(DESTDIR)/usr/share/polkit-1/actions
+	install -m 0644 org.mageia.qarepo-helper.rules  $(DESTDIR)/usr/share/polkit-1/rules.d
+
+dist:
+	@git archive --prefix=$(NAME)-$(VERSION)/ HEAD | xz > $(NAME)-$(VERSION).tar.xz;
+	$(info $(NAME)-$(VERSION).tar.xz is ready)
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..3fc0d3c
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,11 @@
+- use polkit for authentication instead of sudo
+- only accept limited abbreviations of full package names
+  o only the arch and .rpm extension may be omitted
+  o use wildcards and fuzzy version for anything else
+- add check that no updates_testing media are currently enabled
+- add option to suggest a downgrade command
+- rename main program to just 'qarepo'
+
+1.5:
+
+- ensure a '+' in a package name is taken literally
-- 
cgit v1.2.1


From 76fc2d1aa07e263e19e38194cb58e3725b41e179 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 13 Nov 2018 23:11:55 +0000
Subject: Remove explict version number from main program.

It will be automatically inserted when the package is built.
---
 qarepo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qarepo b/qarepo
index bc49731..1724626 100644
--- a/qarepo
+++ b/qarepo
@@ -25,7 +25,7 @@ use Gtk3 '-init';
 use MDK::Common;
 use URPM;
 
-my $version = 'v1.5';
+my $version = '(devel)';
 
 ###############################################################################
 # States and Status
-- 
cgit v1.2.1


From c1592abdd07d7db513646c3bf75d1808cad0d638 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Wed, 14 Nov 2018 00:33:12 +0000
Subject: Fix bug in polkit rules.

---
 org.mageia.qarepo-helper.rules | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/org.mageia.qarepo-helper.rules b/org.mageia.qarepo-helper.rules
index 8408234..6a9e964 100644
--- a/org.mageia.qarepo-helper.rules
+++ b/org.mageia.qarepo-helper.rules
@@ -1,10 +1,9 @@
 polkit.addRule(function(action, subject) {
-    if (action.id == "org.mageia.qarepo-helper.pkexec.run" &&
-        subject.local && subject.active &&
-        subject.isInGroup("qarepo")) {
-        return polkit.Result.YES;
-    } else {
-        return polkit.Result.AUTH_ADMIN_KEEP;
+    if (action.id == "org.mageia.qarepo-helper.pkexec.run") {
+        if (subject.local && subject.active && subject.isInGroup("qarepo")) {
+            return polkit.Result.YES;
+        } else {
+            return polkit.Result.AUTH_ADMIN_KEEP;
+        }
     }
 });
-
-- 
cgit v1.2.1


From f2caaa0e357b2a321fe5e26b08c4c1ad50c96be2 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Fri, 16 Nov 2018 20:06:54 +0000
Subject: Avoid false positive when checking updates_testing media are enabled.

---
 qarepo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qarepo b/qarepo
index 1724626..29962c5 100644
--- a/qarepo
+++ b/qarepo
@@ -372,7 +372,7 @@ sub dialogue_dismiss {
 
 sub check_no_testing_media {
     my ($message2) = @_;
-    if (system("urpmq --list-url | grep -q updates_testing") == 0) {
+    if (system("urpmq --list-media active --list-url | grep -q updates_testing") == 0) {
         my $message1 = "Some updates_testing media are enabled.";
         my $message3 = "Please disable these media and try again.";
         show_error_dialogue(($message1, $message2, $message3));
-- 
cgit v1.2.1


From 4c5a904babd8dbeb3a002ef928fa42d70e6aed58 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sun, 25 Nov 2018 18:08:27 +0000
Subject: Use file:// prefix when adding local repository, to only allow local
 path.

---
 qarepo        | 1 +
 qarepo-helper | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/qarepo b/qarepo
index 29962c5..b7629d7 100644
--- a/qarepo
+++ b/qarepo
@@ -386,6 +386,7 @@ sub set_qa_repo_info {
 
     my $repo_name_and_url = `urpmq --list-url | grep '$qa_repo_name '`;
     chomp($repo_name_and_url);
+    $repo_name_and_url =~ s#file://##;
 
     $active_qa_repo = $repo_name_and_url =~ s/\Q$qa_repo_name\E\s+(\S+)\/$arch/$1/r;
 
diff --git a/qarepo-helper b/qarepo-helper
index 00107fa..49a4b61 100755
--- a/qarepo-helper
+++ b/qarepo-helper
@@ -1,6 +1,6 @@
 #!/bin/sh
 case $1 in
   disable) /usr/sbin/urpmi.removemedia "QA Testing ($2-bit)";;
-  enable)  /usr/sbin/urpmi.addmedia --update "QA Testing ($2-bit)" $3;;
+  enable)  /usr/sbin/urpmi.addmedia --update "QA Testing ($2-bit)" file://$3;;
   update)  /usr/sbin/urpmi.update "QA Testing ($2-bit)";;
 esac
-- 
cgit v1.2.1


From f92b0881239ee80063eb3813a6286a4bb8489fa7 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sun, 25 Nov 2018 18:29:27 +0000
Subject: 1.6

---
 NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index 3fc0d3c..9e7aaf6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+1.6:
+
 - use polkit for authentication instead of sudo
 - only accept limited abbreviations of full package names
   o only the arch and .rpm extension may be omitted
-- 
cgit v1.2.1