summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-04-28 18:25:24 +0000
committerColin Guthrie <colin@mageia.org>2013-04-28 18:25:24 +0000
commitcb2c9b0a1d21a754e0f39d82ebb82d6bbecd6d47 (patch)
treef6d3a0e999271b66fb2eac2674b4570cd5bd60f1
parent52803a8fad83f906945a37ce046de4d2c5e64af0 (diff)
downloadmgaonline-cb2c9b0a1d21a754e0f39d82ebb82d6bbecd6d47.tar
mgaonline-cb2c9b0a1d21a754e0f39d82ebb82d6bbecd6d47.tar.gz
mgaonline-cb2c9b0a1d21a754e0f39d82ebb82d6bbecd6d47.tar.bz2
mgaonline-cb2c9b0a1d21a754e0f39d82ebb82d6bbecd6d47.tar.xz
mgaonline-cb2c9b0a1d21a754e0f39d82ebb82d6bbecd6d47.zip
The $root variable is defined and exported from the mgaonline.pm file.
-rw-r--r--NEWS2
-rwxr-xr-xmgaapplet-upgrade-helper2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ffc16c44..41e0a83a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- do not define the $root variable in mgaapplet-upgrade-helper as it's exported
+ from mgaonline.pm
- exit early from mgaapplet-upgrade-helper if we don't pass expected/required
args
- fix urpm::check_dir() call (old name check_cache_dir() was changed)
diff --git a/mgaapplet-upgrade-helper b/mgaapplet-upgrade-helper
index 3791ec04..02cc37dd 100755
--- a/mgaapplet-upgrade-helper
+++ b/mgaapplet-upgrade-helper
@@ -55,7 +55,7 @@ foreach my $opt (@ARGV) {
die("Usage: mgaapplet-upgrade-helper --new_distro_version=n [--rpm-root-dir] [--urpmi-root=dir] [--download-all=dir]\n") if !$new_distro_version;
-my $root = Rpmdrake::open_db::fast_open_urpmi_db()->{root};
+$root = Rpmdrake::open_db::fast_open_urpmi_db()->{root};
my $product_id = get_product_id();