diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-01-26 15:40:32 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-01-26 15:40:32 +0100 |
| commit | 9740fad81dce0f9389f157ac739473d17ad67839 (patch) | |
| tree | c71eeae7d425f0bc7c42ded5b9dcbb904a44cce5 /usr/local/www/pkg_mgr.php | |
| parent | 2259901018552f8a8432e295b8d6064fa918cda0 (diff) | |
| parent | ee4fc984e1169a180457b3a10e011fab04fd0f31 (diff) | |
| download | pfsense-9740fad81dce0f9389f157ac739473d17ad67839.zip pfsense-9740fad81dce0f9389f157ac739473d17ad67839.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/system.inc
Diffstat (limited to 'usr/local/www/pkg_mgr.php')
| -rwxr-xr-x | usr/local/www/pkg_mgr.php | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php index 3c1ba89..15097a6 100755 --- a/usr/local/www/pkg_mgr.php +++ b/usr/local/www/pkg_mgr.php @@ -44,6 +44,19 @@ require_once("globals.inc"); require_once("guiconfig.inc"); require_once("pkg-utils.inc"); +/* if upgrade in progress, alert user */ +if(is_subsystem_dirty('packagelock')) { + $pgtitle = array(gettext("System"),gettext("Package Manager")); + include("head.inc"); + echo "<body link=\"#0000CC\" vlink=\"#0000CC\" alink=\"#0000CC\">\n"; + include("fbegin.inc"); + echo "Please wait while packages are reinstalled in the background."; + include("fend.inc"); + echo "</body>"; + echo "</html>"; + exit; +} + $pkg_info = get_pkg_info('all', array("noembedded", "name", "category", "website", "version", "status", "descr", "maintainer", "required_version", "maximum_version", "pkginfolink", "supportedbybsdperimeter")); if($pkg_info) { $fout = fopen("{$g['tmp_path']}/pkg_info.cache", "w"); |
