mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-03-12 23:51:08 +00:00
Remove devscripts checks (we Depend on it). Reword python-simplejson error
This commit is contained in:
parent
b5274624ac
commit
00faea17e2
@ -64,8 +64,7 @@ def pull_from_snapshot(package, version, unpack=False):
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
import simplejson as json
|
import simplejson as json
|
||||||
except ImportError:
|
except ImportError:
|
||||||
Logger.error("Require python-simplejson or python >= 2.7 to be "
|
Logger.error("Please install python-simplejson.")
|
||||||
"installed for snapshot.debian.org support")
|
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@ -173,11 +172,6 @@ def main():
|
|||||||
version = args[1]
|
version = args[1]
|
||||||
distance = args[2] if len(args) > 2 else 1
|
distance = args[2] if len(args) > 2 else 1
|
||||||
|
|
||||||
if not os.path.exists('/usr/bin/dget'):
|
|
||||||
Logger.error("dget is not installed. "
|
|
||||||
"Please install the 'devscripts' package.")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
config = UDTConfig(opts.no_conf)
|
config = UDTConfig(opts.no_conf)
|
||||||
if opts.debian_mirror is None:
|
if opts.debian_mirror is None:
|
||||||
opts.debian_mirror = config.get_value('DEBIAN_MIRROR')
|
opts.debian_mirror = config.get_value('DEBIAN_MIRROR')
|
||||||
|
@ -25,8 +25,6 @@ use File::Basename;
|
|||||||
use Getopt::Long;
|
use Getopt::Long;
|
||||||
use AptPkg::Version;
|
use AptPkg::Version;
|
||||||
|
|
||||||
die("Please install 'devscripts'\n") if(! grep -x "$_/dget", split(':',$ENV{'PATH'}));
|
|
||||||
|
|
||||||
my($name) = basename($0);
|
my($name) = basename($0);
|
||||||
my($help, $mirror, $no_conf);
|
my($help, $mirror, $no_conf);
|
||||||
GetOptions('h|help' => \$help,
|
GetOptions('h|help' => \$help,
|
||||||
|
@ -36,11 +36,6 @@ from ubuntutools.lp.udtexceptions import (SeriesNotFoundException,
|
|||||||
PackageNotFoundException, PocketDoesNotExistError)
|
PackageNotFoundException, PocketDoesNotExistError)
|
||||||
from ubuntutools.misc import splitReleasePocket, dsc_url
|
from ubuntutools.misc import splitReleasePocket, dsc_url
|
||||||
|
|
||||||
if not os.path.exists("/usr/bin/dget"):
|
|
||||||
print ("E: dget is not installed - please install the 'devscripts' package"
|
|
||||||
" and rerun this script again.")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
usage = "Usage: %prog <package> [release]"
|
usage = "Usage: %prog <package> [release]"
|
||||||
opt_parser = OptionParser(usage)
|
opt_parser = OptionParser(usage)
|
||||||
|
@ -24,8 +24,6 @@ use File::Basename;
|
|||||||
use LWP::Simple;
|
use LWP::Simple;
|
||||||
use Getopt::Long;
|
use Getopt::Long;
|
||||||
|
|
||||||
die("Please install 'devscripts'\n") if(! grep -x "$_/dget", split(':',$ENV{'PATH'}));
|
|
||||||
|
|
||||||
my $REVU = "revu.ubuntuwire.com";
|
my $REVU = "revu.ubuntuwire.com";
|
||||||
|
|
||||||
my($package) = lc($ARGV[0]) || usage(2);
|
my($package) = lc($ARGV[0]) || usage(2);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user